Skip to content

Commit

Permalink
Fix conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
ajnebro committed Jan 22, 2024
1 parent e1cb6bf commit b1de5e5
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 53 deletions.
12 changes: 0 additions & 12 deletions examples/experiment/comparison.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,7 @@ def configure_experiment(problems: dict, n_run: int):
probability=1.0 / problem.number_of_variables, distribution_index=20
),
crossover=SBXCrossover(probability=1.0, distribution_index=20),
<<<<<<< HEAD
termination_criterion=StoppingByEvaluations(max_evaluations=max_evaluations),
=======
termination_criterion=StoppingByEvaluations(max_evaluations=max_evaluations)
>>>>>>> 8c0a6cf (Feature/mixed solution (#73))
),
algorithm_tag="NSGAII",
problem_tag=problem_tag,
Expand All @@ -43,11 +39,7 @@ def configure_experiment(problems: dict, n_run: int):
population_size=100,
cr=0.5,
f=0.5,
<<<<<<< HEAD
termination_criterion=StoppingByEvaluations(max_evaluations=max_evaluations),
=======
termination_criterion=StoppingByEvaluations(max_evaluations=max_evaluations)
>>>>>>> 8c0a6cf (Feature/mixed solution (#73))
),
algorithm_tag="GDE3",
problem_tag=problem_tag,
Expand All @@ -63,11 +55,7 @@ def configure_experiment(problems: dict, n_run: int):
probability=1.0 / problem.number_of_variables, distribution_index=20
),
leaders=CrowdingDistanceArchive(100),
<<<<<<< HEAD
termination_criterion=StoppingByEvaluations(max_evaluations=max_evaluations),
=======
termination_criterion=StoppingByEvaluations(max_evaluations=max_evaluations)
>>>>>>> 8c0a6cf (Feature/mixed solution (#73))
),
algorithm_tag="SMPSO",
problem_tag=problem_tag,
Expand Down
2 changes: 1 addition & 1 deletion examples/multiobjective/moead/moeaddra_lz09.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

if __name__ == "__main__":
problem = LZ09_F1()
problem.reference_front = read_solutions(filename="resources/reference_front/LZ09F1.pf")
problem.reference_front = read_solutions(filename="resources/reference_front/LZ09_F1.pf")

max_evaluations = 300000

Expand Down
4 changes: 0 additions & 4 deletions examples/multiobjective/nsgaiii/nsgaiii_dtlz2.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,7 @@
reference_directions=UniformReferenceDirectionFactory(3, n_points=91),
mutation=PolynomialMutation(probability=1.0 / problem.number_of_variables(), distribution_index=20),
crossover=SBXCrossover(probability=1.0, distribution_index=30),
<<<<<<< HEAD
termination_criterion=StoppingByEvaluations(max_evaluations=max_evaluations),
=======
termination_criterion=StoppingByEvaluations(max_evaluations=max_evaluations)
>>>>>>> 8c0a6cf (Feature/mixed solution (#73))
)

algorithm.run()
Expand Down
10 changes: 0 additions & 10 deletions examples/multiobjective/omopso/omopso_spark_evaluator.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,9 @@
swarm_size=swarm_size,
epsilon=0.0075,
uniform_mutation=UniformMutation(probability=mutation_probability, perturbation=0.5),
<<<<<<< HEAD
non_uniform_mutation=NonUniformMutation(
mutation_probability, perturbation=0.5, max_iterations=max_evaluations / swarm_size
),
=======
non_uniform_mutation=NonUniformMutation(mutation_probability, perturbation=0.5,
max_iterations=max_evaluations / swarm_size),
>>>>>>> 8c0a6cf (Feature/mixed solution (#73))
leaders=CrowdingDistanceArchive(10),
termination_criterion=StoppingByEvaluations(max_evaluations=max_evaluations),
swarm_evaluator=SparkEvaluator(),
Expand All @@ -40,13 +35,8 @@
front = algorithm.get_result()

# Save results to file
<<<<<<< HEAD
print_function_values_to_file(front, "FUN." + algorithm.get_name() + "." + problem.name())
print_variables_to_file(front, "VAR." + algorithm.get_name() + "." + problem.name())
=======
print_function_values_to_file(front, 'FUN.' + algorithm.get_name() + "." + problem.get_name())
print_variables_to_file(front, 'VAR.' + algorithm.get_name() + "." + problem.get_name())
>>>>>>> 8c0a6cf (Feature/mixed solution (#73))

print(f"Algorithm: {algorithm.get_name()}")
print(f"Problem: {problem.name()}")
Expand Down
4 changes: 0 additions & 4 deletions examples/multiobjective/omopso/omopso_zdt1.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,7 @@
mutation_probability, perturbation=0.5, max_iterations=int(max_evaluations / swarm_size)
),
leaders=CrowdingDistanceArchive(100),
<<<<<<< HEAD
termination_criterion=StoppingByEvaluations(max_evaluations=max_evaluations),
=======
termination_criterion=StoppingByEvaluations(max_evaluations=max_evaluations)
>>>>>>> 8c0a6cf (Feature/mixed solution (#73))
)

algorithm.run()
Expand Down
16 changes: 0 additions & 16 deletions jmetal/algorithm/test/ittest_algorithm.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,7 @@ def test_NSGAII(self):
offspring_population_size=self.offspring_size,
mutation=self.mutation,
crossover=self.crossover,
<<<<<<< HEAD
termination_criterion=StoppingByEvaluations(max_evaluations=1000),
=======
termination_criterion=StoppingByEvaluations(max_evaluations=1000)
>>>>>>> 8c0a6cf (Feature/mixed solution (#73))
).run()

def test_SMPSO(self):
Expand All @@ -39,11 +35,7 @@ def test_SMPSO(self):
swarm_size=self.population_size,
mutation=self.mutation,
leaders=CrowdingDistanceArchive(100),
<<<<<<< HEAD
termination_criterion=StoppingByEvaluations(max_evaluations=1000),
=======
termination_criterion=StoppingByEvaluations(max_evaluations=1000)
>>>>>>> 8c0a6cf (Feature/mixed solution (#73))
).run()


Expand All @@ -59,11 +51,7 @@ def test_should_NSGAII_work_when_solving_problem_ZDT1_with_standard_settings(sel
offspring_population_size=100,
mutation=PolynomialMutation(probability=1.0 / problem.number_of_variables, distribution_index=20),
crossover=SBXCrossover(probability=1.0, distribution_index=20),
<<<<<<< HEAD
termination_criterion=StoppingByEvaluations(max_evaluations=max_evaluations),
=======
termination_criterion=StoppingByEvaluations(max_evaluations=max_evaluations)
>>>>>>> 8c0a6cf (Feature/mixed solution (#73))
)

algorithm.run()
Expand All @@ -82,11 +70,7 @@ def test_should_SMPSO_work_when_solving_problem_ZDT1_with_standard_settings(self
swarm_size=100,
mutation=PolynomialMutation(probability=1.0 / problem.number_of_variables, distribution_index=20),
leaders=CrowdingDistanceArchive(100),
<<<<<<< HEAD
termination_criterion=StoppingByEvaluations(max_evaluations=25000),
=======
termination_criterion=StoppingByEvaluations(max_evaluations=25000)
>>>>>>> 8c0a6cf (Feature/mixed solution (#73))
)

algorithm.run()
Expand Down
12 changes: 6 additions & 6 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
from os.path import abspath, dirname, join

import setuptools

<<<<<<< HEAD
if __name__ == "__main__":
setuptools.setup()
=======
#if __name__ == "__main__":
# setuptools.setup()

from setuptools import find_packages, setup

basedir = abspath(dirname(__file__))
Expand Down Expand Up @@ -54,5 +55,4 @@
'PyHamcrest',
'mock'
]
)
>>>>>>> 8c0a6cf (Feature/mixed solution (#73))
)

0 comments on commit b1de5e5

Please sign in to comment.