Skip to content

Commit

Permalink
Minor changes
Browse files Browse the repository at this point in the history
  • Loading branch information
ajnebro committed Jun 14, 2021
1 parent 45d87fc commit 12093d3
Show file tree
Hide file tree
Showing 8 changed files with 24 additions and 16 deletions.
5 changes: 3 additions & 2 deletions examples/multiobjective/nsgaiii/nsgaiii_dtlz2.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
from jmetal.algorithm.multiobjective.nsgaiii import NSGAIII, UniformReferenceDirectionFactory
from jmetal.operator import SBXCrossover, PolynomialMutation
from jmetal.problem import DTLZ2
from jmetal.util.solution import read_solutions, print_function_values_to_file, print_variables_to_file
from jmetal.util.solution import read_solutions, print_function_values_to_file, print_variables_to_file, \
get_non_dominated_solutions
from jmetal.util.termination_criterion import StoppingByEvaluations

if __name__ == '__main__':
Expand All @@ -20,7 +21,7 @@
)

algorithm.run()
front = algorithm.get_result()
front = get_non_dominated_solutions(algorithm.get_result())

# Save results to file
print_function_values_to_file(front, 'FUN.' + algorithm.label)
Expand Down
3 changes: 2 additions & 1 deletion examples/singleobjective/gde3/gde3_single_objective.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from jmetal.algorithm.multiobjective.gde3 import GDE3
from jmetal.problem.singleobjective.unconstrained import Rastrigin
from jmetal.util.observer import PrintObjectivesObserver
from jmetal.util.solution import print_function_values_to_file, print_variables_to_file
from jmetal.util.termination_criterion import StoppingByEvaluations

Expand All @@ -11,7 +12,7 @@
population_size=100,
cr=0.5,
f=0.5,
termination_criterion=StoppingByEvaluations(50000)
termination_criterion=StoppingByEvaluations(100000)
)

algorithm.run()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,21 +1,24 @@
from jmetal.algorithm.singleobjective.genetic_algorithm import GeneticAlgorithm
from jmetal.operator import BitFlipMutation, SPXCrossover, BinaryTournamentSelection
from jmetal.problem import OneMax
from jmetal.util.observer import PrintObjectivesObserver
from jmetal.util.termination_criterion import StoppingByEvaluations

if __name__ == '__main__':
problem = OneMax(number_of_bits=1024)
problem = OneMax(number_of_bits=512)

algorithm = GeneticAlgorithm(
problem=problem,
population_size=100,
offspring_population_size=1,
population_size=40,
offspring_population_size=40,
mutation=BitFlipMutation(1.0 / problem.number_of_bits),
crossover=SPXCrossover(1.0),
selection=BinaryTournamentSelection(),
termination_criterion=StoppingByEvaluations(max_evaluations=20000)
)

algorithm.observable.register(observer=PrintObjectivesObserver(100))

algorithm.run()
result = algorithm.get_result()

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
algorithm = GeneticAlgorithm(
problem=problem,
population_size=100,
offspring_population_size=100,
offspring_population_size=1,
mutation=PolynomialMutation(1.0 / problem.number_of_variables, 20.0),
crossover=SBXCrossover(0.9, 20.0),
crossover=SBXCrossover(0.9, 5.0),
selection=BinaryTournamentSelection(),
termination_criterion=StoppingByEvaluations(max_evaluations=500000)
termination_criterion=StoppingByEvaluations(max_evaluations=100000)
)

algorithm.run()
Expand Down
5 changes: 4 additions & 1 deletion examples/singleobjective/local_search/local_search_binary.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
from jmetal.algorithm.singleobjective.local_search import LocalSearch
from jmetal.operator import BitFlipMutation
from jmetal.problem import OneMax
from jmetal.util.observer import ProgressBarObserver, PrintObjectivesObserver
from jmetal.util.solution import print_function_values_to_file, print_variables_to_file
from jmetal.util.termination_criterion import StoppingByEvaluations

if __name__ == '__main__':
problem = OneMax(number_of_bits=1024)
problem = OneMax(number_of_bits=512)

max_evaluations = 10000
algorithm = LocalSearch(
Expand All @@ -14,6 +15,8 @@
termination_criterion=StoppingByEvaluations(max_evaluations=max_evaluations)
)

algorithm.observable.register(observer=PrintObjectivesObserver(100))

algorithm.run()
result = algorithm.get_result()

Expand Down
6 changes: 3 additions & 3 deletions examples/singleobjective/local_search/local_search_float.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
from jmetal.algorithm.singleobjective.local_search import LocalSearch
from jmetal.operator import PolynomialMutation
from jmetal.problem.singleobjective.unconstrained import Sphere
from jmetal.problem.singleobjective.unconstrained import Sphere, Rastrigin
from jmetal.util.solution import print_function_values_to_file, print_variables_to_file
from jmetal.util.termination_criterion import StoppingByEvaluations

if __name__ == '__main__':
problem = Sphere(10)
problem = Rastrigin(10)

max_evaluations = 1000000
max_evaluations = 100000

algorithm = LocalSearch(
problem=problem,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
from jmetal.util.termination_criterion import StoppingByEvaluations

if __name__ == '__main__':
problem = OneMax(number_of_bits=1024)
problem = OneMax(number_of_bits=512)

max_evaluations = 20000
max_evaluations = 10000

algorithm = SimulatedAnnealing(
problem=problem,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
if __name__ == '__main__':
problem = Rastrigin(10)

max_evaluations = 250000
max_evaluations = 100000

algorithm = SimulatedAnnealing(
problem=problem,
Expand Down

0 comments on commit 12093d3

Please sign in to comment.