From 10cfb5ddb76e32984ba710b72cf782f044e8ed23 Mon Sep 17 00:00:00 2001 From: ajnebro Date: Mon, 2 Sep 2024 16:29:24 +0200 Subject: [PATCH] Optimize imports --- examples/experiment/comparison.py | 3 ++- examples/multiobjective/hype/hype_zdt1.py | 2 +- examples/multiobjective/ibea/ibea_zdt1.py | 2 +- examples/multiobjective/mocell/mocell_zdt1.py | 3 +-- .../multiobjective/nsgaii/distributed_nsgaii_with_dask.py | 2 +- .../nsgaii/distributed_nsgaii_with_dask_evaluator.py | 2 +- .../nsgaii/distributed_nsgaii_with_spark_evaluator.py | 2 +- examples/multiobjective/nsgaii/dynamic_nsgaii_solving_fda2.py | 2 +- .../nsgaii/gnsgaii_solving_zdt2_with_reference_point.py | 2 +- .../nsgaii/nsgaii_defining_schaffer_problem_on_the_fly.py | 2 +- .../nsgaii/nsgaii_defining_srinivas_problem_on_the_fly.py | 2 +- examples/multiobjective/nsgaii/nsgaii_solving_3D_problem.py | 2 +- examples/multiobjective/nsgaii/nsgaii_solving_ZDT5.py | 2 +- .../multiobjective/nsgaii/nsgaii_solving_binary_problem.py | 2 +- .../nsgaii/nsgaii_solving_constrained_srinivas_problem.py | 2 +- .../nsgaii/nsgaii_solving_mixed_encoding_problem.py | 4 ++-- examples/multiobjective/nsgaii/nsgaii_ssp.py | 2 +- examples/multiobjective/nsgaii/nsgaii_standard_settings.py | 2 +- .../nsgaii_standard_settings_with_real_time_plotting.py | 2 +- examples/multiobjective/nsgaii/nsgaii_steady_state.py | 2 +- .../nsgaii/nsgaii_steady_state_with_real_time_plotting.py | 2 +- .../nsgaii/parallel_nsgaii_with_multiprocess_evaluator.py | 2 +- examples/multiobjective/nsgaiii/nsgaiii_dtlz2.py | 2 +- examples/multiobjective/omopso/omopso_spark_evaluator.py | 2 +- .../preferences/gnsgaii_solving_zdt2_with_reference_point.py | 2 +- examples/multiobjective/spea2/gspea2_zdt1.py | 2 +- examples/multiobjective/spea2/spea2_dtlz1.py | 2 +- examples/multiobjective/spea2/spea2_zdt1.py | 2 +- .../generational_genetic_algorithm_binary.py | 2 +- .../genetic_algorithm/generational_genetic_algorithm_float.py | 2 +- .../generational_genetic_algorithm_tsp_with_contraints.py | 2 +- .../genetic_algorithm/steady_state_genetic_algorithm.py | 4 ++-- .../steady_state_genetic_algorithm_with_knapsack_problem.py | 4 ++-- .../singleobjective/nsgaii/nsgaii_single_objective_binary.py | 2 +- .../singleobjective/nsgaii/nsgaii_single_objective_float.py | 2 +- src/jmetal/algorithm/multiobjective/gde3.py | 2 -- src/jmetal/algorithm/multiobjective/omopso.py | 2 +- 37 files changed, 40 insertions(+), 42 deletions(-) diff --git a/examples/experiment/comparison.py b/examples/experiment/comparison.py index dc14e61c..767fb6d3 100644 --- a/examples/experiment/comparison.py +++ b/examples/experiment/comparison.py @@ -3,12 +3,13 @@ from jmetal.algorithm.multiobjective.smpso import SMPSO from jmetal.core.quality_indicator import * from jmetal.lab.experiment import Experiment, Job, generate_summary_from_experiment -from jmetal.operator.mutation import PolynomialMutation from jmetal.operator.crossover import SBXCrossover +from jmetal.operator.mutation import PolynomialMutation from jmetal.problem import ZDT1, ZDT2, ZDT3 from jmetal.util.archive import CrowdingDistanceArchive from jmetal.util.termination_criterion import StoppingByEvaluations + def configure_experiment(problems: dict, n_run: int): jobs = [] max_evaluations = 25000 diff --git a/examples/multiobjective/hype/hype_zdt1.py b/examples/multiobjective/hype/hype_zdt1.py index cf88cfd7..93d9056d 100644 --- a/examples/multiobjective/hype/hype_zdt1.py +++ b/examples/multiobjective/hype/hype_zdt1.py @@ -1,7 +1,7 @@ from jmetal.algorithm.multiobjective.hype import HYPE from jmetal.core.solution import FloatSolution -from jmetal.operator.mutation import PolynomialMutation from jmetal.operator.crossover import SBXCrossover +from jmetal.operator.mutation import PolynomialMutation from jmetal.problem import ZDT1 from jmetal.util.solution import ( print_function_values_to_file, diff --git a/examples/multiobjective/ibea/ibea_zdt1.py b/examples/multiobjective/ibea/ibea_zdt1.py index a64d2259..7475a05d 100644 --- a/examples/multiobjective/ibea/ibea_zdt1.py +++ b/examples/multiobjective/ibea/ibea_zdt1.py @@ -1,6 +1,6 @@ from jmetal.algorithm.multiobjective.ibea import IBEA -from jmetal.operator.mutation import PolynomialMutation from jmetal.operator.crossover import SBXCrossover +from jmetal.operator.mutation import PolynomialMutation from jmetal.problem import ZDT1 from jmetal.util.solution import ( print_function_values_to_file, diff --git a/examples/multiobjective/mocell/mocell_zdt1.py b/examples/multiobjective/mocell/mocell_zdt1.py index 7d0bff3e..6f15b5fb 100644 --- a/examples/multiobjective/mocell/mocell_zdt1.py +++ b/examples/multiobjective/mocell/mocell_zdt1.py @@ -1,6 +1,6 @@ from jmetal.algorithm.multiobjective.mocell import MOCell -from jmetal.operator.mutation import PolynomialMutation from jmetal.operator.crossover import SBXCrossover +from jmetal.operator.mutation import PolynomialMutation from jmetal.problem import ZDT1 from jmetal.util.archive import CrowdingDistanceArchive from jmetal.util.neighborhood import C9 @@ -9,7 +9,6 @@ print_variables_to_file, read_solutions, ) - from jmetal.util.termination_criterion import StoppingByEvaluations if __name__ == "__main__": diff --git a/examples/multiobjective/nsgaii/distributed_nsgaii_with_dask.py b/examples/multiobjective/nsgaii/distributed_nsgaii_with_dask.py index 094ecf5f..0349ad7a 100644 --- a/examples/multiobjective/nsgaii/distributed_nsgaii_with_dask.py +++ b/examples/multiobjective/nsgaii/distributed_nsgaii_with_dask.py @@ -2,8 +2,8 @@ from distributed import LocalCluster from jmetal.algorithm.multiobjective.nsgaii import DistributedNSGAII -from jmetal.operator.mutation import PolynomialMutation from jmetal.operator.crossover import SBXCrossover +from jmetal.operator.mutation import PolynomialMutation from jmetal.problem.multiobjective.zdt import ZDT1Modified from jmetal.util.termination_criterion import StoppingByEvaluations diff --git a/examples/multiobjective/nsgaii/distributed_nsgaii_with_dask_evaluator.py b/examples/multiobjective/nsgaii/distributed_nsgaii_with_dask_evaluator.py index b6729ffb..e6591bb2 100644 --- a/examples/multiobjective/nsgaii/distributed_nsgaii_with_dask_evaluator.py +++ b/examples/multiobjective/nsgaii/distributed_nsgaii_with_dask_evaluator.py @@ -1,6 +1,6 @@ from jmetal.algorithm.multiobjective.nsgaii import NSGAII -from jmetal.operator.mutation import PolynomialMutation from jmetal.operator.crossover import SBXCrossover +from jmetal.operator.mutation import PolynomialMutation from jmetal.problem.multiobjective.zdt import ZDT1Modified from jmetal.util.evaluator import DaskEvaluator from jmetal.util.solution import print_function_values_to_file, print_variables_to_file diff --git a/examples/multiobjective/nsgaii/distributed_nsgaii_with_spark_evaluator.py b/examples/multiobjective/nsgaii/distributed_nsgaii_with_spark_evaluator.py index 52ac46de..8a13fc36 100644 --- a/examples/multiobjective/nsgaii/distributed_nsgaii_with_spark_evaluator.py +++ b/examples/multiobjective/nsgaii/distributed_nsgaii_with_spark_evaluator.py @@ -1,6 +1,6 @@ from jmetal.algorithm.multiobjective.nsgaii import NSGAII -from jmetal.operator.mutation import PolynomialMutation from jmetal.operator.crossover import SBXCrossover +from jmetal.operator.mutation import PolynomialMutation from jmetal.problem.multiobjective.zdt import ZDT1Modified from jmetal.util.evaluator import SparkEvaluator from jmetal.util.solution import print_function_values_to_file, print_variables_to_file diff --git a/examples/multiobjective/nsgaii/dynamic_nsgaii_solving_fda2.py b/examples/multiobjective/nsgaii/dynamic_nsgaii_solving_fda2.py index 2675988b..aad72349 100644 --- a/examples/multiobjective/nsgaii/dynamic_nsgaii_solving_fda2.py +++ b/examples/multiobjective/nsgaii/dynamic_nsgaii_solving_fda2.py @@ -1,6 +1,6 @@ from jmetal.algorithm.multiobjective.nsgaii import DynamicNSGAII -from jmetal.operator.mutation import PolynomialMutation from jmetal.operator.crossover import SBXCrossover +from jmetal.operator.mutation import PolynomialMutation from jmetal.problem.multiobjective.fda import FDA2 from jmetal.util.observable import TimeCounter from jmetal.util.observer import PlotFrontToFileObserver, WriteFrontToFileObserver diff --git a/examples/multiobjective/nsgaii/gnsgaii_solving_zdt2_with_reference_point.py b/examples/multiobjective/nsgaii/gnsgaii_solving_zdt2_with_reference_point.py index 3e134d83..1deba311 100644 --- a/examples/multiobjective/nsgaii/gnsgaii_solving_zdt2_with_reference_point.py +++ b/examples/multiobjective/nsgaii/gnsgaii_solving_zdt2_with_reference_point.py @@ -1,7 +1,7 @@ from jmetal.algorithm.multiobjective.nsgaii import NSGAII from jmetal.lab.visualization import Plot, InteractivePlot -from jmetal.operator.mutation import PolynomialMutation from jmetal.operator.crossover import SBXCrossover +from jmetal.operator.mutation import PolynomialMutation from jmetal.problem import ZDT2 from jmetal.util.comparator import GDominanceComparator from jmetal.util.observer import ProgressBarObserver, VisualizerObserver diff --git a/examples/multiobjective/nsgaii/nsgaii_defining_schaffer_problem_on_the_fly.py b/examples/multiobjective/nsgaii/nsgaii_defining_schaffer_problem_on_the_fly.py index efb84e78..4c02c163 100644 --- a/examples/multiobjective/nsgaii/nsgaii_defining_schaffer_problem_on_the_fly.py +++ b/examples/multiobjective/nsgaii/nsgaii_defining_schaffer_problem_on_the_fly.py @@ -1,7 +1,7 @@ from jmetal.algorithm.multiobjective.nsgaii import NSGAII from jmetal.core.problem import OnTheFlyFloatProblem -from jmetal.operator.mutation import PolynomialMutation from jmetal.operator.crossover import SBXCrossover +from jmetal.operator.mutation import PolynomialMutation from jmetal.util.solution import ( get_non_dominated_solutions, print_function_values_to_file, diff --git a/examples/multiobjective/nsgaii/nsgaii_defining_srinivas_problem_on_the_fly.py b/examples/multiobjective/nsgaii/nsgaii_defining_srinivas_problem_on_the_fly.py index 346f54be..a4c6a3bd 100644 --- a/examples/multiobjective/nsgaii/nsgaii_defining_srinivas_problem_on_the_fly.py +++ b/examples/multiobjective/nsgaii/nsgaii_defining_srinivas_problem_on_the_fly.py @@ -1,7 +1,7 @@ from jmetal.algorithm.multiobjective.nsgaii import NSGAII from jmetal.core.problem import OnTheFlyFloatProblem -from jmetal.operator.mutation import PolynomialMutation from jmetal.operator.crossover import SBXCrossover +from jmetal.operator.mutation import PolynomialMutation from jmetal.util.comparator import DominanceWithConstraintsComparator from jmetal.util.solution import ( get_non_dominated_solutions, diff --git a/examples/multiobjective/nsgaii/nsgaii_solving_3D_problem.py b/examples/multiobjective/nsgaii/nsgaii_solving_3D_problem.py index 346f54be..a4c6a3bd 100644 --- a/examples/multiobjective/nsgaii/nsgaii_solving_3D_problem.py +++ b/examples/multiobjective/nsgaii/nsgaii_solving_3D_problem.py @@ -1,7 +1,7 @@ from jmetal.algorithm.multiobjective.nsgaii import NSGAII from jmetal.core.problem import OnTheFlyFloatProblem -from jmetal.operator.mutation import PolynomialMutation from jmetal.operator.crossover import SBXCrossover +from jmetal.operator.mutation import PolynomialMutation from jmetal.util.comparator import DominanceWithConstraintsComparator from jmetal.util.solution import ( get_non_dominated_solutions, diff --git a/examples/multiobjective/nsgaii/nsgaii_solving_ZDT5.py b/examples/multiobjective/nsgaii/nsgaii_solving_ZDT5.py index 0eeaebfe..c3ef0e8f 100644 --- a/examples/multiobjective/nsgaii/nsgaii_solving_ZDT5.py +++ b/examples/multiobjective/nsgaii/nsgaii_solving_ZDT5.py @@ -1,6 +1,6 @@ from jmetal.algorithm.multiobjective.nsgaii import NSGAII -from jmetal.operator.mutation import BitFlipMutation from jmetal.operator.crossover import SPXCrossover +from jmetal.operator.mutation import BitFlipMutation from jmetal.problem import ZDT5 from jmetal.util.solution import print_function_values_to_file, print_variables_to_file from jmetal.util.termination_criterion import StoppingByEvaluations diff --git a/examples/multiobjective/nsgaii/nsgaii_solving_binary_problem.py b/examples/multiobjective/nsgaii/nsgaii_solving_binary_problem.py index 12aa8c5f..74909314 100644 --- a/examples/multiobjective/nsgaii/nsgaii_solving_binary_problem.py +++ b/examples/multiobjective/nsgaii/nsgaii_solving_binary_problem.py @@ -1,6 +1,6 @@ from jmetal.algorithm.multiobjective.nsgaii import NSGAII -from jmetal.operator.mutation import BitFlipMutation from jmetal.operator.crossover import SPXCrossover +from jmetal.operator.mutation import BitFlipMutation from jmetal.problem.multiobjective.unconstrained import OneZeroMax from jmetal.util.solution import print_function_values_to_file, print_variables_to_file from jmetal.util.termination_criterion import StoppingByEvaluations diff --git a/examples/multiobjective/nsgaii/nsgaii_solving_constrained_srinivas_problem.py b/examples/multiobjective/nsgaii/nsgaii_solving_constrained_srinivas_problem.py index 4233878b..51067c72 100644 --- a/examples/multiobjective/nsgaii/nsgaii_solving_constrained_srinivas_problem.py +++ b/examples/multiobjective/nsgaii/nsgaii_solving_constrained_srinivas_problem.py @@ -1,6 +1,6 @@ from jmetal.algorithm.multiobjective import NSGAII -from jmetal.operator.mutation import PolynomialMutation from jmetal.operator.crossover import SBXCrossover +from jmetal.operator.mutation import PolynomialMutation from jmetal.problem import Srinivas from jmetal.util.comparator import DominanceWithConstraintsComparator from jmetal.util.solution import ( diff --git a/examples/multiobjective/nsgaii/nsgaii_solving_mixed_encoding_problem.py b/examples/multiobjective/nsgaii/nsgaii_solving_mixed_encoding_problem.py index 67890bc1..87ccf632 100644 --- a/examples/multiobjective/nsgaii/nsgaii_solving_mixed_encoding_problem.py +++ b/examples/multiobjective/nsgaii/nsgaii_solving_mixed_encoding_problem.py @@ -1,8 +1,8 @@ from jmetal.algorithm.multiobjective.nsgaii import NSGAII -from jmetal.operator.mutation import IntegerPolynomialMutation, PolynomialMutation -from jmetal.operator.crossover import SBXCrossover from jmetal.operator.crossover import CompositeCrossover, IntegerSBXCrossover +from jmetal.operator.crossover import SBXCrossover from jmetal.operator.mutation import CompositeMutation +from jmetal.operator.mutation import IntegerPolynomialMutation, PolynomialMutation from jmetal.problem.multiobjective.unconstrained import MixedIntegerFloatProblem from jmetal.util.solution import ( get_non_dominated_solutions, diff --git a/examples/multiobjective/nsgaii/nsgaii_ssp.py b/examples/multiobjective/nsgaii/nsgaii_ssp.py index 4207d9fa..1ec4a8da 100644 --- a/examples/multiobjective/nsgaii/nsgaii_ssp.py +++ b/examples/multiobjective/nsgaii/nsgaii_ssp.py @@ -1,6 +1,6 @@ from jmetal.algorithm.multiobjective.nsgaii import NSGAII -from jmetal.operator.mutation import BitFlipMutation from jmetal.operator.crossover import SPXCrossover +from jmetal.operator.mutation import BitFlipMutation from jmetal.problem.multiobjective.unconstrained import SubsetSum from jmetal.util.solution import print_function_values_to_file, print_variables_to_file from jmetal.util.termination_criterion import StoppingByEvaluations diff --git a/examples/multiobjective/nsgaii/nsgaii_standard_settings.py b/examples/multiobjective/nsgaii/nsgaii_standard_settings.py index ec51ff3d..ae39c193 100644 --- a/examples/multiobjective/nsgaii/nsgaii_standard_settings.py +++ b/examples/multiobjective/nsgaii/nsgaii_standard_settings.py @@ -1,6 +1,6 @@ from jmetal.algorithm.multiobjective.nsgaii import NSGAII -from jmetal.operator.mutation import PolynomialMutation from jmetal.operator.crossover import SBXCrossover +from jmetal.operator.mutation import PolynomialMutation from jmetal.problem import ZDT4 from jmetal.util.solution import ( get_non_dominated_solutions, diff --git a/examples/multiobjective/nsgaii/nsgaii_standard_settings_with_real_time_plotting.py b/examples/multiobjective/nsgaii/nsgaii_standard_settings_with_real_time_plotting.py index 79c8b393..d2df0aae 100644 --- a/examples/multiobjective/nsgaii/nsgaii_standard_settings_with_real_time_plotting.py +++ b/examples/multiobjective/nsgaii/nsgaii_standard_settings_with_real_time_plotting.py @@ -1,7 +1,7 @@ from jmetal.algorithm.multiobjective.nsgaii import NSGAII from jmetal.lab.visualization import InteractivePlot, Plot -from jmetal.operator.mutation import PolynomialMutation from jmetal.operator.crossover import SBXCrossover +from jmetal.operator.mutation import PolynomialMutation from jmetal.problem import ZDT1 from jmetal.util.observer import ProgressBarObserver, VisualizerObserver from jmetal.util.solution import ( diff --git a/examples/multiobjective/nsgaii/nsgaii_steady_state.py b/examples/multiobjective/nsgaii/nsgaii_steady_state.py index 6f17edf0..333167ff 100644 --- a/examples/multiobjective/nsgaii/nsgaii_steady_state.py +++ b/examples/multiobjective/nsgaii/nsgaii_steady_state.py @@ -1,6 +1,6 @@ from jmetal.algorithm.multiobjective.nsgaii import NSGAII -from jmetal.operator.mutation import PolynomialMutation from jmetal.operator.crossover import SBXCrossover +from jmetal.operator.mutation import PolynomialMutation from jmetal.problem import ZDT1 from jmetal.util.solution import ( get_non_dominated_solutions, diff --git a/examples/multiobjective/nsgaii/nsgaii_steady_state_with_real_time_plotting.py b/examples/multiobjective/nsgaii/nsgaii_steady_state_with_real_time_plotting.py index a388e642..013c63ec 100644 --- a/examples/multiobjective/nsgaii/nsgaii_steady_state_with_real_time_plotting.py +++ b/examples/multiobjective/nsgaii/nsgaii_steady_state_with_real_time_plotting.py @@ -1,7 +1,7 @@ from jmetal.algorithm.multiobjective.nsgaii import NSGAII from jmetal.lab.visualization import InteractivePlot, Plot -from jmetal.operator.mutation import PolynomialMutation from jmetal.operator.crossover import SBXCrossover +from jmetal.operator.mutation import PolynomialMutation from jmetal.problem import ZDT1 from jmetal.util.observer import ProgressBarObserver, VisualizerObserver from jmetal.util.solution import ( diff --git a/examples/multiobjective/nsgaii/parallel_nsgaii_with_multiprocess_evaluator.py b/examples/multiobjective/nsgaii/parallel_nsgaii_with_multiprocess_evaluator.py index 82074cb6..6255618c 100644 --- a/examples/multiobjective/nsgaii/parallel_nsgaii_with_multiprocess_evaluator.py +++ b/examples/multiobjective/nsgaii/parallel_nsgaii_with_multiprocess_evaluator.py @@ -1,6 +1,6 @@ from jmetal.algorithm.multiobjective.nsgaii import NSGAII -from jmetal.operator.mutation import PolynomialMutation from jmetal.operator.crossover import SBXCrossover +from jmetal.operator.mutation import PolynomialMutation from jmetal.problem.multiobjective.zdt import ZDT1Modified from jmetal.util.evaluator import MultiprocessEvaluator from jmetal.util.solution import print_function_values_to_file, print_variables_to_file diff --git a/examples/multiobjective/nsgaiii/nsgaiii_dtlz2.py b/examples/multiobjective/nsgaiii/nsgaiii_dtlz2.py index 7f42502d..8de82f6a 100644 --- a/examples/multiobjective/nsgaiii/nsgaiii_dtlz2.py +++ b/examples/multiobjective/nsgaiii/nsgaiii_dtlz2.py @@ -2,8 +2,8 @@ NSGAIII, UniformReferenceDirectionFactory, ) -from jmetal.operator.mutation import PolynomialMutation from jmetal.operator.crossover import SBXCrossover +from jmetal.operator.mutation import PolynomialMutation from jmetal.problem import DTLZ2 from jmetal.util.solution import ( get_non_dominated_solutions, diff --git a/examples/multiobjective/omopso/omopso_spark_evaluator.py b/examples/multiobjective/omopso/omopso_spark_evaluator.py index a89b72cd..9f95e1e8 100644 --- a/examples/multiobjective/omopso/omopso_spark_evaluator.py +++ b/examples/multiobjective/omopso/omopso_spark_evaluator.py @@ -1,6 +1,6 @@ from jmetal.algorithm.multiobjective.omopso import OMOPSO -from jmetal.operator.mutation import UniformMutation from jmetal.operator.mutation import NonUniformMutation +from jmetal.operator.mutation import UniformMutation from jmetal.problem.multiobjective.zdt import ZDT1Modified from jmetal.util.archive import CrowdingDistanceArchive from jmetal.util.evaluator import SparkEvaluator diff --git a/examples/multiobjective/preferences/gnsgaii_solving_zdt2_with_reference_point.py b/examples/multiobjective/preferences/gnsgaii_solving_zdt2_with_reference_point.py index f58e5074..c5ddf526 100644 --- a/examples/multiobjective/preferences/gnsgaii_solving_zdt2_with_reference_point.py +++ b/examples/multiobjective/preferences/gnsgaii_solving_zdt2_with_reference_point.py @@ -1,7 +1,7 @@ from jmetal.algorithm.multiobjective.nsgaii import NSGAII from jmetal.lab.visualization import InteractivePlot, Plot -from jmetal.operator.mutation import PolynomialMutation from jmetal.operator.crossover import SBXCrossover +from jmetal.operator.mutation import PolynomialMutation from jmetal.problem import ZDT2 from jmetal.util.comparator import GDominanceComparator from jmetal.util.observer import ProgressBarObserver, VisualizerObserver diff --git a/examples/multiobjective/spea2/gspea2_zdt1.py b/examples/multiobjective/spea2/gspea2_zdt1.py index dbd27da7..07102e63 100644 --- a/examples/multiobjective/spea2/gspea2_zdt1.py +++ b/examples/multiobjective/spea2/gspea2_zdt1.py @@ -1,6 +1,6 @@ from jmetal.algorithm.multiobjective.spea2 import SPEA2 -from jmetal.operator.mutation import PolynomialMutation from jmetal.operator.crossover import SBXCrossover +from jmetal.operator.mutation import PolynomialMutation from jmetal.problem import ZDT1 from jmetal.util.comparator import GDominanceComparator from jmetal.util.solution import ( diff --git a/examples/multiobjective/spea2/spea2_dtlz1.py b/examples/multiobjective/spea2/spea2_dtlz1.py index 7bd6f441..e278604b 100644 --- a/examples/multiobjective/spea2/spea2_dtlz1.py +++ b/examples/multiobjective/spea2/spea2_dtlz1.py @@ -1,6 +1,6 @@ from jmetal.algorithm.multiobjective.spea2 import SPEA2 -from jmetal.operator.mutation import PolynomialMutation from jmetal.operator.crossover import SBXCrossover +from jmetal.operator.mutation import PolynomialMutation from jmetal.problem import DTLZ2 from jmetal.util.solution import ( print_function_values_to_file, diff --git a/examples/multiobjective/spea2/spea2_zdt1.py b/examples/multiobjective/spea2/spea2_zdt1.py index 78863e6a..37f6381c 100644 --- a/examples/multiobjective/spea2/spea2_zdt1.py +++ b/examples/multiobjective/spea2/spea2_zdt1.py @@ -1,6 +1,6 @@ from jmetal.algorithm.multiobjective.spea2 import SPEA2 -from jmetal.operator.mutation import PolynomialMutation from jmetal.operator.crossover import SBXCrossover +from jmetal.operator.mutation import PolynomialMutation from jmetal.problem import ZDT1 from jmetal.util.solution import ( print_function_values_to_file, diff --git a/examples/singleobjective/genetic_algorithm/generational_genetic_algorithm_binary.py b/examples/singleobjective/genetic_algorithm/generational_genetic_algorithm_binary.py index 67d26fe3..2be470c9 100644 --- a/examples/singleobjective/genetic_algorithm/generational_genetic_algorithm_binary.py +++ b/examples/singleobjective/genetic_algorithm/generational_genetic_algorithm_binary.py @@ -1,6 +1,6 @@ from jmetal.algorithm.singleobjective.genetic_algorithm import GeneticAlgorithm -from jmetal.operator.mutation import BitFlipMutation from jmetal.operator.crossover import SPXCrossover +from jmetal.operator.mutation import BitFlipMutation from jmetal.problem import OneMax from jmetal.util.observer import PrintObjectivesObserver from jmetal.util.termination_criterion import StoppingByEvaluations diff --git a/examples/singleobjective/genetic_algorithm/generational_genetic_algorithm_float.py b/examples/singleobjective/genetic_algorithm/generational_genetic_algorithm_float.py index d6fd12c1..e3760153 100644 --- a/examples/singleobjective/genetic_algorithm/generational_genetic_algorithm_float.py +++ b/examples/singleobjective/genetic_algorithm/generational_genetic_algorithm_float.py @@ -1,6 +1,6 @@ from jmetal.algorithm.singleobjective.genetic_algorithm import GeneticAlgorithm -from jmetal.operator.mutation import PolynomialMutation from jmetal.operator.crossover import SBXCrossover +from jmetal.operator.mutation import PolynomialMutation from jmetal.problem.singleobjective.unconstrained import Rastrigin from jmetal.util.termination_criterion import StoppingByEvaluations diff --git a/examples/singleobjective/genetic_algorithm/generational_genetic_algorithm_tsp_with_contraints.py b/examples/singleobjective/genetic_algorithm/generational_genetic_algorithm_tsp_with_contraints.py index b62a7ad8..ce833072 100644 --- a/examples/singleobjective/genetic_algorithm/generational_genetic_algorithm_tsp_with_contraints.py +++ b/examples/singleobjective/genetic_algorithm/generational_genetic_algorithm_tsp_with_contraints.py @@ -1,8 +1,8 @@ from jmetal.algorithm.singleobjective.genetic_algorithm import GeneticAlgorithm from jmetal.core.solution import PermutationSolution -from jmetal.operator.selection import BinaryTournamentSelection from jmetal.operator.crossover import PMXCrossover from jmetal.operator.mutation import PermutationSwapMutation +from jmetal.operator.selection import BinaryTournamentSelection from jmetal.problem.singleobjective.tsp import TSP from jmetal.util.comparator import MultiComparator, OverallConstraintViolationComparator, ObjectiveComparator from jmetal.util.observer import PrintObjectivesObserver diff --git a/examples/singleobjective/genetic_algorithm/steady_state_genetic_algorithm.py b/examples/singleobjective/genetic_algorithm/steady_state_genetic_algorithm.py index df45ebc1..7887d321 100644 --- a/examples/singleobjective/genetic_algorithm/steady_state_genetic_algorithm.py +++ b/examples/singleobjective/genetic_algorithm/steady_state_genetic_algorithm.py @@ -1,7 +1,7 @@ from jmetal.algorithm.singleobjective.genetic_algorithm import GeneticAlgorithm -from jmetal.operator.selection import BinaryTournamentSelection -from jmetal.operator.mutation import BitFlipMutation from jmetal.operator.crossover import SPXCrossover +from jmetal.operator.mutation import BitFlipMutation +from jmetal.operator.selection import BinaryTournamentSelection from jmetal.problem.singleobjective.unconstrained import SubsetSum from jmetal.util.termination_criterion import StoppingByEvaluations diff --git a/examples/singleobjective/genetic_algorithm/steady_state_genetic_algorithm_with_knapsack_problem.py b/examples/singleobjective/genetic_algorithm/steady_state_genetic_algorithm_with_knapsack_problem.py index c4e4f638..580beb13 100644 --- a/examples/singleobjective/genetic_algorithm/steady_state_genetic_algorithm_with_knapsack_problem.py +++ b/examples/singleobjective/genetic_algorithm/steady_state_genetic_algorithm_with_knapsack_problem.py @@ -1,7 +1,7 @@ from jmetal.algorithm.singleobjective.genetic_algorithm import GeneticAlgorithm -from jmetal.operator.selection import BinaryTournamentSelection -from jmetal.operator.mutation import BitFlipMutation from jmetal.operator.crossover import SPXCrossover +from jmetal.operator.mutation import BitFlipMutation +from jmetal.operator.selection import BinaryTournamentSelection from jmetal.problem.singleobjective.knapsack import Knapsack from jmetal.util.termination_criterion import StoppingByEvaluations diff --git a/examples/singleobjective/nsgaii/nsgaii_single_objective_binary.py b/examples/singleobjective/nsgaii/nsgaii_single_objective_binary.py index 4b0e7fdd..6af4e055 100644 --- a/examples/singleobjective/nsgaii/nsgaii_single_objective_binary.py +++ b/examples/singleobjective/nsgaii/nsgaii_single_objective_binary.py @@ -1,6 +1,6 @@ from jmetal.algorithm.multiobjective.nsgaii import NSGAII -from jmetal.operator.mutation import BitFlipMutation from jmetal.operator.crossover import SPXCrossover +from jmetal.operator.mutation import BitFlipMutation from jmetal.problem import OneMax from jmetal.util.comparator import DominanceComparator from jmetal.util.observer import ProgressBarObserver diff --git a/examples/singleobjective/nsgaii/nsgaii_single_objective_float.py b/examples/singleobjective/nsgaii/nsgaii_single_objective_float.py index 32fa56ea..ede5944f 100644 --- a/examples/singleobjective/nsgaii/nsgaii_single_objective_float.py +++ b/examples/singleobjective/nsgaii/nsgaii_single_objective_float.py @@ -1,6 +1,6 @@ from jmetal.algorithm.multiobjective.nsgaii import NSGAII -from jmetal.operator.mutation import PolynomialMutation from jmetal.operator.crossover import SBXCrossover +from jmetal.operator.mutation import PolynomialMutation from jmetal.problem.singleobjective.unconstrained import Rastrigin from jmetal.util.comparator import DominanceComparator from jmetal.util.solution import print_function_values_to_file, print_variables_to_file diff --git a/src/jmetal/algorithm/multiobjective/gde3.py b/src/jmetal/algorithm/multiobjective/gde3.py index b8a39513..37911909 100644 --- a/src/jmetal/algorithm/multiobjective/gde3.py +++ b/src/jmetal/algorithm/multiobjective/gde3.py @@ -5,8 +5,6 @@ from jmetal.core.problem import DynamicProblem, Problem from jmetal.core.solution import FloatSolution from jmetal.operator.crossover import DifferentialEvolutionCrossover -from jmetal.operator.selection import DifferentialEvolutionSelection - from jmetal.operator.selection import DifferentialEvolutionSelection from jmetal.util.comparator import Comparator, DominanceComparator from jmetal.util.evaluator import Evaluator diff --git a/src/jmetal/algorithm/multiobjective/omopso.py b/src/jmetal/algorithm/multiobjective/omopso.py index e391344f..0db387a0 100644 --- a/src/jmetal/algorithm/multiobjective/omopso.py +++ b/src/jmetal/algorithm/multiobjective/omopso.py @@ -8,8 +8,8 @@ from jmetal.core.algorithm import ParticleSwarmOptimization from jmetal.core.problem import FloatProblem from jmetal.core.solution import FloatSolution -from jmetal.operator.mutation import UniformMutation from jmetal.operator.mutation import NonUniformMutation +from jmetal.operator.mutation import UniformMutation from jmetal.util.archive import BoundedArchive, NonDominatedSolutionsArchive from jmetal.util.comparator import DominanceComparator, EpsilonDominanceComparator from jmetal.util.evaluator import Evaluator