Update for v5

dhadka · dhadka · commit f9057bc630d3 · 2025-01-17T13:45:46.000-07:00
diff --git a/ext/native/NativeC/META-INF/services/org.moeaframework.core.spi.ProblemProvider b/ext/native/NativeC/META-INF/services/org.moeaframework.core.spi.ProblemProvider
@@ -0,0 +1 @@
+org.moeaframework.benchmark.NativeCProvider
diff --git a/ext/native/NativeC/META-INF/services/org.moeaframework.problem.ProblemProvider b/ext/native/NativeC/META-INF/services/org.moeaframework.problem.ProblemProvider
diff --git a/ext/native/NativeC/src/org/moeaframework/benchmark/NativeC.java b/ext/native/NativeC/src/org/moeaframework/benchmark/NativeC.java
@@ -1,7 +1,6 @@
 package org.moeaframework.benchmark;
 
 import org.moeaframework.core.Solution;
-import org.moeaframework.core.variable.EncodingUtils;
 import org.moeaframework.core.variable.RealVariable;
 import org.moeaframework.problem.AbstractProblem;
 
@@ -21,14 +20,14 @@ public NativeC() {
 	}
 
 	public void evaluate(Solution solution) {
-		double[] vars = EncodingUtils.getReal(solution);
+		double[] vars = RealVariable.getReal(solution);
 		double[] objs = new double[numberOfObjectives];
 		double[] constrs = new double[numberOfConstraints];
 
 		INSTANCE.evaluate(vars, objs, constrs);
 
-		solution.setObjectives(objs);
-		solution.setConstraints(constrs);
+		solution.setObjectiveValues(objs);
+		solution.setConstraintValues(constrs);
 	}
 
 	public Solution newSolution() {
diff --git a/ext/native/NativeC/src/org/moeaframework/benchmark/NativeCDirectMapping.java b/ext/native/NativeC/src/org/moeaframework/benchmark/NativeCDirectMapping.java
@@ -1,7 +1,6 @@
 package org.moeaframework.benchmark;
 
 import org.moeaframework.core.Solution;
-import org.moeaframework.core.variable.EncodingUtils;
 import org.moeaframework.core.variable.RealVariable;
 import org.moeaframework.problem.AbstractProblem;
 
@@ -21,14 +20,14 @@ public NativeCDirectMapping() {
 	}
 
 	public void evaluate(Solution solution) {
-		double[] vars = EncodingUtils.getReal(solution);
+		double[] vars = RealVariable.getReal(solution);
 		double[] objs = new double[numberOfObjectives];
 		double[] constrs = new double[numberOfConstraints];
 
 		evaluate(vars, objs, constrs);
 
-		solution.setObjectives(objs);
-		solution.setConstraints(constrs);
+		solution.setObjectiveValues(objs);
+		solution.setConstraintValues(constrs);
 	}
 
 	public Solution newSolution() {
diff --git a/ext/native/NativeCPP/META-INF/services/org.moeaframework.core.spi.ProblemProvider b/ext/native/NativeCPP/META-INF/services/org.moeaframework.core.spi.ProblemProvider
@@ -0,0 +1 @@
+org.moeaframework.benchmark.NativeCPPProvider
diff --git a/ext/native/NativeCPP/META-INF/services/org.moeaframework.problem.ProblemProvider b/ext/native/NativeCPP/META-INF/services/org.moeaframework.problem.ProblemProvider
diff --git a/ext/native/NativeCPP/src/org/moeaframework/benchmark/Example.java b/ext/native/NativeCPP/src/org/moeaframework/benchmark/Example.java
@@ -1,7 +1,7 @@
 package org.moeaframework.benchmark;
 
 import org.moeaframework.algorithm.NSGAII;
-import org.moeaframework.core.Problem;
+import org.moeaframework.problem.Problem;
 
 public class Example {
 
diff --git a/ext/native/NativeCPP/src/org/moeaframework/benchmark/NativeCPP.java b/ext/native/NativeCPP/src/org/moeaframework/benchmark/NativeCPP.java
@@ -1,7 +1,6 @@
 package org.moeaframework.benchmark;
 
 import org.moeaframework.core.Solution;
-import org.moeaframework.core.variable.EncodingUtils;
 import org.moeaframework.core.variable.RealVariable;
 import org.moeaframework.problem.AbstractProblem;
 
@@ -21,14 +20,14 @@ public NativeCPP() {
 	}
 
 	public void evaluate(Solution solution) {
-		double[] vars = EncodingUtils.getReal(solution);
+		double[] vars = RealVariable.getReal(solution);
 		double[] objs = new double[numberOfObjectives];
 		double[] constrs = new double[numberOfConstraints];
 
 		INSTANCE.evaluate(vars, objs, constrs);
 
-		solution.setObjectives(objs);
-		solution.setConstraints(constrs);
+		solution.setObjectiveValues(objs);
+		solution.setConstraintValues(constrs);
 	}
 
 	public Solution newSolution() {
diff --git a/ext/native/NativeCPP/src/org/moeaframework/benchmark/NativeCPPDirectMapping.java b/ext/native/NativeCPP/src/org/moeaframework/benchmark/NativeCPPDirectMapping.java
@@ -1,7 +1,6 @@
 package org.moeaframework.benchmark;
 
 import org.moeaframework.core.Solution;
-import org.moeaframework.core.variable.EncodingUtils;
 import org.moeaframework.core.variable.RealVariable;
 import org.moeaframework.problem.AbstractProblem;
 
@@ -21,14 +20,14 @@ public NativeCPPDirectMapping() {
 	}
 
 	public void evaluate(Solution solution) {
-		double[] vars = EncodingUtils.getReal(solution);
+		double[] vars = RealVariable.getReal(solution);
 		double[] objs = new double[numberOfObjectives];
 		double[] constrs = new double[numberOfConstraints];
 
 		evaluate(vars, objs, constrs);
 
-		solution.setObjectives(objs);
-		solution.setConstraints(constrs);
+		solution.setObjectiveValues(objs);
+		solution.setConstraintValues(constrs);
 	}
 
 	public Solution newSolution() {
diff --git a/ext/native/NativeFortran/META-INF/services/org.moeaframework.core.spi.ProblemProvider b/ext/native/NativeFortran/META-INF/services/org.moeaframework.core.spi.ProblemProvider
@@ -0,0 +1 @@
+org.moeaframework.benchmark.NativeFortranProvider
diff --git a/ext/native/NativeFortran/META-INF/services/org.moeaframework.problem.ProblemProvider b/ext/native/NativeFortran/META-INF/services/org.moeaframework.problem.ProblemProvider
diff --git a/ext/native/NativeFortran/src/org/moeaframework/benchmark/Example.java b/ext/native/NativeFortran/src/org/moeaframework/benchmark/Example.java
@@ -1,7 +1,7 @@
 package org.moeaframework.benchmark;
 
 import org.moeaframework.algorithm.NSGAII;
-import org.moeaframework.core.Problem;
+import org.moeaframework.problem.Problem;
 
 public class Example {
 
diff --git a/ext/native/NativeFortran/src/org/moeaframework/benchmark/NativeFortran.java b/ext/native/NativeFortran/src/org/moeaframework/benchmark/NativeFortran.java
@@ -1,7 +1,6 @@
 package org.moeaframework.benchmark;
 
 import org.moeaframework.core.Solution;
-import org.moeaframework.core.variable.EncodingUtils;
 import org.moeaframework.core.variable.RealVariable;
 import org.moeaframework.problem.AbstractProblem;
 
@@ -21,14 +20,14 @@ public NativeFortran() {
 	}
 
 	public void evaluate(Solution solution) {
-		double[] vars = EncodingUtils.getReal(solution);
+		double[] vars = RealVariable.getReal(solution);
 		double[] objs = new double[numberOfObjectives];
 		double[] constrs = new double[numberOfConstraints];
 
 		INSTANCE.evaluate(vars, objs, constrs);
 
-		solution.setObjectives(objs);
-		solution.setConstraints(constrs);
+		solution.setObjectiveValues(objs);
+		solution.setConstraintValues(constrs);
 	}
 
 	public Solution newSolution() {
diff --git a/ext/native/NativeFortran/src/org/moeaframework/benchmark/NativeFortranDirectMapping.java b/ext/native/NativeFortran/src/org/moeaframework/benchmark/NativeFortranDirectMapping.java
@@ -1,7 +1,6 @@
 package org.moeaframework.benchmark;
 
 import org.moeaframework.core.Solution;
-import org.moeaframework.core.variable.EncodingUtils;
 import org.moeaframework.core.variable.RealVariable;
 import org.moeaframework.problem.AbstractProblem;
 
@@ -21,14 +20,14 @@ public NativeFortranDirectMapping() {
 	}
 
 	public void evaluate(Solution solution) {
-		double[] vars = EncodingUtils.getReal(solution);
+		double[] vars = RealVariable.getReal(solution);
 		double[] objs = new double[numberOfObjectives];
 		double[] constrs = new double[numberOfConstraints];
 
 		evaluate(vars, objs, constrs);
 
-		solution.setObjectives(objs);
-		solution.setConstraints(constrs);
+		solution.setObjectiveValues(objs);
+		solution.setConstraintValues(constrs);
 	}
 
 	public Solution newSolution() {
diff --git a/pom.xml b/pom.xml
@@ -33,11 +33,13 @@
       <artifactId>pisa-plugin</artifactId>
       <version>3.0.0-SNAPSHOT</version>
     </dependency>
+    <!-- Need to also remove @Ignore
     <dependency>
       <groupId>org.moeaframework</groupId>
       <artifactId>real-world-benchmarks</artifactId>
       <version>1.1.0</version>
     </dependency>
+    -->
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
diff --git a/src/main/java/org/moeaframework/benchmark/AbstractBenchmark.java b/src/main/java/org/moeaframework/benchmark/AbstractBenchmark.java
@@ -21,8 +21,8 @@
 import java.util.function.Supplier;
 
 import org.moeaframework.algorithm.NSGAII;
-import org.moeaframework.core.Algorithm;
-import org.moeaframework.core.Problem;
+import org.moeaframework.algorithm.Algorithm;
+import org.moeaframework.problem.Problem;
 
 public class AbstractBenchmark implements Benchmark {
 	
diff --git a/src/main/java/org/moeaframework/benchmark/Benchmark.java b/src/main/java/org/moeaframework/benchmark/Benchmark.java
@@ -22,7 +22,7 @@
 
 import org.apache.commons.lang3.reflect.ConstructorUtils;
 import org.moeaframework.core.FrameworkException;
-import org.moeaframework.core.Problem;
+import org.moeaframework.problem.Problem;
 
 public interface Benchmark {
 	
diff --git a/src/main/java/org/moeaframework/benchmark/JMetalPluginBenchmark.java b/src/main/java/org/moeaframework/benchmark/JMetalPluginBenchmark.java
@@ -19,10 +19,10 @@
 
 import java.io.IOException;
 
-import org.moeaframework.core.Algorithm;
+import org.moeaframework.algorithm.Algorithm;
 import org.moeaframework.core.spi.AlgorithmFactory;
 import org.moeaframework.problem.DTLZ.DTLZ2;
-import org.moeaframework.util.TypedProperties;
+import org.moeaframework.core.TypedProperties;
 
 public class JMetalPluginBenchmark implements Benchmark {
 
diff --git a/src/test/java/org/moeaframework/integration/BasicTest.java b/src/test/java/org/moeaframework/integration/BasicTest.java
@@ -4,10 +4,11 @@
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.moeaframework.Executor;
+import org.moeaframework.algorithm.Algorithm;
 import org.moeaframework.algorithm.NSGAII;
-import org.moeaframework.core.NondominatedPopulation;
-import org.moeaframework.core.Problem;
+import org.moeaframework.core.population.NondominatedPopulation;
+import org.moeaframework.core.spi.AlgorithmFactory;
+import org.moeaframework.problem.Problem;
 import org.moeaframework.problem.DTLZ.DTLZ2;
 
 public class BasicTest {
@@ -27,19 +28,20 @@ public void testDirect() {
 	
 	@Test
 	public void testSPI() {
-		NondominatedPopulation result = new Executor()
-				.withProblem("UF1")
-				.withAlgorithm("NSGAII")
-				.withMaxEvaluations(10000)
-				.run();
+		Problem problem = new DTLZ2(2);
+
+		Algorithm algorithm = AlgorithmFactory.getInstance().getAlgorithm("NSGAII", problem);
+		algorithm.run(10000);
+		
+		NondominatedPopulation result = algorithm.getResult();
 		
 		Assert.assertNotNull(result);
 		Assert.assertTrue(result.size() > 0);
 	}
 	
 	@Test
 	public void testReferenceSet() throws IOException {
-		Assert.assertNotNull(NondominatedPopulation.loadReferenceSet("pf/DTLZ2.2D.pf"));
+		Assert.assertNotNull(NondominatedPopulation.load("pf/DTLZ2.2D.pf"));
 	}
 
 }
diff --git a/src/test/java/org/moeaframework/integration/GeneralizedDecompositionTest.java b/src/test/java/org/moeaframework/integration/GeneralizedDecompositionTest.java
diff --git a/src/test/java/org/moeaframework/integration/JMetalTest.java b/src/test/java/org/moeaframework/integration/JMetalTest.java
@@ -2,18 +2,22 @@
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.moeaframework.Executor;
-import org.moeaframework.core.NondominatedPopulation;
+import org.moeaframework.algorithm.Algorithm;
+import org.moeaframework.core.population.NondominatedPopulation;
+import org.moeaframework.core.spi.AlgorithmFactory;
+import org.moeaframework.problem.Problem;
+import org.moeaframework.problem.CEC2009.UF1;
 
 public class JMetalTest {
 	
 	@Test
 	public void test() {
-		NondominatedPopulation result = new Executor()
-				.withProblem("UF1")
-				.withAlgorithm("AbYSS-JMetal")
-				.withMaxEvaluations(10000)
-				.run();
+		Problem problem = new UF1();
+
+		Algorithm algorithm = AlgorithmFactory.getInstance().getAlgorithm("AbYSS-JMetal", problem);
+		algorithm.run(10000);
+
+		NondominatedPopulation result = algorithm.getResult();
 		
 		Assert.assertNotNull(result);
 		Assert.assertTrue(result.size() > 0);
diff --git a/src/test/java/org/moeaframework/integration/PISATest.java b/src/test/java/org/moeaframework/integration/PISATest.java
@@ -2,18 +2,22 @@
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.moeaframework.Executor;
-import org.moeaframework.core.NondominatedPopulation;
+import org.moeaframework.algorithm.Algorithm;
+import org.moeaframework.core.population.NondominatedPopulation;
+import org.moeaframework.core.spi.AlgorithmFactory;
+import org.moeaframework.problem.Problem;
+import org.moeaframework.problem.CEC2009.UF1;
 
 public class PISATest {
 	
 	@Test
 	public void testPISA() {
-		NondominatedPopulation result = new Executor()
-				.withProblem("UF1")
-				.withAlgorithm("hype-pisa")
-				.withMaxEvaluations(10000)
-				.run();
+		Problem problem = new UF1();
+
+		Algorithm algorithm = AlgorithmFactory.getInstance().getAlgorithm("hype-pisa", problem);
+		algorithm.run(10000);
+
+		NondominatedPopulation result = algorithm.getResult();
 		
 		Assert.assertNotNull(result);
 		Assert.assertTrue(result.size() > 0);
diff --git a/src/test/java/org/moeaframework/integration/RealWorldBenchmarksTest.java b/src/test/java/org/moeaframework/integration/RealWorldBenchmarksTest.java
@@ -1,19 +1,25 @@
 package org.moeaframework.integration;
 
 import org.junit.Assert;
+import org.junit.Ignore;
 import org.junit.Test;
-import org.moeaframework.Executor;
-import org.moeaframework.core.NondominatedPopulation;
+import org.moeaframework.algorithm.Algorithm;
+import org.moeaframework.algorithm.NSGAII;
+import org.moeaframework.core.population.NondominatedPopulation;
+import org.moeaframework.core.spi.ProblemFactory;
+import org.moeaframework.problem.Problem;
 
 public class RealWorldBenchmarksTest {
 	
 	@Test
+	@Ignore
 	public void testRealWorldBenchmarks() {
-		NondominatedPopulation result = new Executor()
-				.withProblem("GAA")
-				.withAlgorithm("NSGAII")
-				.withMaxEvaluations(10000)
-				.run();
+		Problem problem = ProblemFactory.getInstance().getProblem("GAA");
+
+		Algorithm algorithm = new NSGAII(problem);
+		algorithm.run(10000);
+
+		NondominatedPopulation result = algorithm.getResult();
 		
 		Assert.assertNotNull(result);
 		Assert.assertTrue(result.size() > 0);

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+org.moeaframework.benchmark.NativeCProvider`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+org.moeaframework.benchmark.NativeCPPProvider`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+org.moeaframework.benchmark.NativeFortranProvider`