jMetal
diff --git a/‎examples/multiobjective/nsgaii/nsgaii_standard_settings_with_distance_based_archive.py‎
Lines changed: 0 additions & 4 deletions b/‎examples/multiobjective/nsgaii/nsgaii_standard_settings_with_distance_based_archive.py‎
Lines changed: 0 additions & 4 deletions
diff --git a/‎examples/multiobjective/tuning/__init__.py‎
Lines changed: 0 additions & 8 deletions b/‎examples/multiobjective/tuning/__init__.py‎
Lines changed: 0 additions & 8 deletions
diff --git a/‎examples/multiobjective/tuning/tune_nsgaii_with_archive.py‎
Lines changed: 0 additions & 181 deletions b/‎examples/multiobjective/tuning/tune_nsgaii_with_archive.py‎
Lines changed: 0 additions & 181 deletions
diff --git a/‎examples/multiobjective/tuning/tune_nsgaii_zdt1_validation.py‎
Lines changed: 0 additions & 117 deletions b/‎examples/multiobjective/tuning/tune_nsgaii_zdt1_validation.py‎
Lines changed: 0 additions & 117 deletions
@@ -32,11 +32,7 @@
     archive = DistanceBasedArchive(maximum_size=100, metric=DistanceMetric.L2_SQUARED, use_vectorized=True)
     evaluator = SequentialEvaluatorWithArchive(archive)
 
-<<<<<<< HEAD
-    max_evaluations = 50000
-=======
     max_evaluations = 40000
->>>>>>> 6f4d831 (Add Optuna hyperparameter tuning package)
     algorithm = NSGAII(
         problem=problem,
         population_size=100,