Refresh contents from local project jMetalAuto

jMetal · Mar 19, 2020 · ffe63a3 · ffe63a3
1 parent 18e187f
commit ffe63a3
Show file tree

Hide file tree

Showing 193 changed files with 7,589 additions and 2,751 deletions.
diff --git a/...lgorithm/src/main/java/org/uma/jmetal/algorithm/multiobjective/dmopso/DMOPSOMeasures.java b/...lgorithm/src/main/java/org/uma/jmetal/algorithm/multiobjective/dmopso/DMOPSOMeasures.java
@@ -2,7 +2,7 @@
 
 import org.uma.jmetal.problem.doubleproblem.DoubleProblem;
 import org.uma.jmetal.qualityindicator.impl.Epsilon;
-import org.uma.jmetal.qualityindicator.impl.hypervolume.PISAHypervolume;
+import org.uma.jmetal.qualityindicator.impl.hypervolume.impl.PISAHypervolume;
 import org.uma.jmetal.solution.doublesolution.DoubleSolution;
 import org.uma.jmetal.util.front.Front;
 import org.uma.jmetal.util.front.impl.ArrayFront;

diff --git a/jmetal-algorithm/src/main/java/org/uma/jmetal/algorithm/multiobjective/ibea/mIBEA.java b/jmetal-algorithm/src/main/java/org/uma/jmetal/algorithm/multiobjective/ibea/mIBEA.java
@@ -5,11 +5,10 @@
 import org.uma.jmetal.operator.selection.SelectionOperator;
 import org.uma.jmetal.problem.Problem;
 import org.uma.jmetal.solution.Solution;
+import org.uma.jmetal.util.SolutionListUtils;
 
 import java.util.ArrayList;
 import java.util.List;
-import org.uma.jmetal.algorithm.multiobjective.ibea.IBEA;
-import org.uma.jmetal.util.SolutionListUtils;
 
 /** This class implements the IBEA algorithm */
 @SuppressWarnings("serial")

diff --git a/jmetal-algorithm/src/main/java/org/uma/jmetal/algorithm/multiobjective/moead/MOEAD.java b/jmetal-algorithm/src/main/java/org/uma/jmetal/algorithm/multiobjective/moead/MOEAD.java
@@ -32,7 +32,6 @@ public class MOEAD<S extends Solution<?>> extends ComponentBasedEvolutionaryAlgo
 
   /** Constructor */
   public MOEAD(
-      Problem<S> problem,
       Evaluation<S> evaluation,
       InitialSolutionsCreation<S> initialPopulationCreation,
       Termination termination,
@@ -41,7 +40,6 @@ public MOEAD(
       MOEADReplacement<S> replacement) {
     super(
         "MOEAD",
-        problem,
         evaluation,
         initialPopulationCreation,
         termination,
@@ -125,6 +123,8 @@ public MOEAD(
 
     this.termination = termination;
 
-    this.evaluation = new SequentialEvaluation<>();
+    this.evaluation = new SequentialEvaluation<>(problem);
+
+    this.archive = null ;
   }
 }
diff --git a/jmetal-algorithm/src/main/java/org/uma/jmetal/algorithm/multiobjective/moead/MOEADDE.java b/jmetal-algorithm/src/main/java/org/uma/jmetal/algorithm/multiobjective/moead/MOEADDE.java
@@ -31,7 +31,6 @@ public class MOEADDE extends ComponentBasedEvolutionaryAlgorithm<DoubleSolution>
 
   /** Constructor */
   public MOEADDE(
-        Problem<DoubleSolution> problem,
         Evaluation<DoubleSolution> evaluation,
         InitialSolutionsCreation<DoubleSolution> initialPopulationCreation,
         Termination termination,
@@ -40,7 +39,6 @@ public MOEADDE(
         MOEADReplacement replacement) {
         super(
         "MOEAD-DE",
-        problem,
         evaluation,
         initialPopulationCreation,
         termination,
@@ -78,7 +76,6 @@ public MOEADDE(
     this.observable = new DefaultObservable<>(name);
     this.attributes = new HashMap<>();
 
-
     SequenceGenerator<Integer> subProblemIdGenerator =
         new IntegerPermutationGenerator(populationSize);
 
@@ -134,6 +131,8 @@ public MOEADDE(
 
     this.termination = termination ;
 
-    this.evaluation = new SequentialEvaluation<>() ;
+    this.evaluation = new SequentialEvaluation<>(problem) ;
+
+    this.archive = null ;
   }
 }
diff --git a/...rithm/src/main/java/org/uma/jmetal/algorithm/multiobjective/moead/MOEADDEWithArchive.java b/...rithm/src/main/java/org/uma/jmetal/algorithm/multiobjective/moead/MOEADDEWithArchive.java
diff --git a/...gorithm/src/main/java/org/uma/jmetal/algorithm/multiobjective/moead/MOEADWithArchive.java b/...gorithm/src/main/java/org/uma/jmetal/algorithm/multiobjective/moead/MOEADWithArchive.java
diff --git a/jmetal-algorithm/src/main/java/org/uma/jmetal/algorithm/multiobjective/nsgaii/NSGAII.java b/jmetal-algorithm/src/main/java/org/uma/jmetal/algorithm/multiobjective/nsgaii/NSGAII.java
@@ -31,7 +31,6 @@ public class NSGAII<S extends Solution<?>> extends ComponentBasedEvolutionaryAlg
   /**
    * Constructor
    *
-   * @param problem
    * @param evaluation
    * @param initialPopulationCreation
    * @param termination
@@ -40,7 +39,6 @@ public class NSGAII<S extends Solution<?>> extends ComponentBasedEvolutionaryAlg
    * @param replacement
    */
   public NSGAII(
-      Problem<S> problem,
       Evaluation<S> evaluation,
       InitialSolutionsCreation<S> initialPopulationCreation,
       Termination termination,
@@ -49,7 +47,6 @@ public NSGAII(
       RankingAndDensityEstimatorReplacement<S> replacement) {
     super(
         "NSGA-II",
-        problem,
         evaluation,
         initialPopulationCreation,
         termination,
@@ -67,8 +64,8 @@ public NSGAII(
       MutationOperator<S> mutationOperator,
       Termination termination,
       Ranking<S> ranking) {
-    this.name = "NSGA-II" ;
-    this.problem = problem ;
+    this.name = "NSGA-II";
+    this.problem = problem;
     this.observable = new DefaultObservable<>(name);
     this.attributes = new HashMap<>();
 
@@ -94,7 +91,9 @@ public NSGAII(
 
     this.termination = termination;
 
-    this.evaluation = new SequentialEvaluation<>();
+    this.evaluation = new SequentialEvaluation<>(problem);
+
+    this.archive = null;
   }
 
   /** Constructor */

diff --git a/...rithm/src/main/java/org/uma/jmetal/algorithm/multiobjective/nsgaii/NSGAIIWithArchive.java b/...rithm/src/main/java/org/uma/jmetal/algorithm/multiobjective/nsgaii/NSGAIIWithArchive.java
diff --git a/...in/java/org/uma/jmetal/algorithm/multiobjective/nsgaii/jmetal5version/NSGAIIMeasures.java b/...in/java/org/uma/jmetal/algorithm/multiobjective/nsgaii/jmetal5version/NSGAIIMeasures.java
@@ -4,7 +4,7 @@
 import org.uma.jmetal.operator.mutation.MutationOperator;
 import org.uma.jmetal.operator.selection.SelectionOperator;
 import org.uma.jmetal.problem.Problem;
-import org.uma.jmetal.qualityindicator.impl.hypervolume.PISAHypervolume;
+import org.uma.jmetal.qualityindicator.impl.hypervolume.impl.PISAHypervolume;
 import org.uma.jmetal.solution.Solution;
 import org.uma.jmetal.util.SolutionListUtils;
 import org.uma.jmetal.util.evaluator.SolutionListEvaluator;

diff --git a/jmetal-algorithm/src/main/java/org/uma/jmetal/algorithm/multiobjective/smpso/SMPSO.java b/jmetal-algorithm/src/main/java/org/uma/jmetal/algorithm/multiobjective/smpso/SMPSO.java
@@ -210,7 +210,7 @@ protected List<DoubleSolution> createInitialSwarm() {
 
   @Override
   protected List<DoubleSolution> evaluateSwarm(List<DoubleSolution> swarm) {
-    return evaluation.evaluate(swarm, problem);
+    return evaluation.evaluate(swarm);
   }
 
   @Override