Merge pull request #11 from MOEAFramework/moeaframework-5.0

dhadka · web-flow · commit 0a4b5f6b8528 · 2025-01-17T14:04:13.000-07:00
Update for moeaframework-5.0
diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
@@ -29,13 +29,11 @@ on:
         required: true
         description: Java version
         options:
-          - '17'
-          - '18'
           - '19'
           - '20'
           - '21'
           - '22'
-        default: '17'
+        default: '19'
         
 env:
   SAMPLES: ${{ inputs.samples || '10' }}
@@ -52,7 +50,7 @@ jobs:
       - name: Setup build
         uses: MOEAFramework/.github/actions/setup-build@main
         with:
-          java-version: ${{ inputs.java-version }}
+          java-version: ${{ inputs.java-version || '19' }}
           java-distribution: ${{ inputs.java-distribution }}
           setup-python: true
           setup-fortran: true
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -21,13 +21,11 @@ on:
         required: true
         description: Java version
         options:
-          - '17'
-          - '18'
           - '19'
           - '20'
           - '21'
           - '22'
-        default: '17'
+        default: '19'
         
 jobs:
   maven-test:
@@ -37,7 +35,7 @@ jobs:
     - name: Setup build
       uses: MOEAFramework/.github/actions/setup-build@main
       with:
-        java-version: ${{ inputs.java-version }}
+        java-version: ${{ inputs.java-version || '19' }}
         java-distribution: ${{ inputs.java-distribution }}
     - name: Run tests
       run: mvn test
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/Example.java b/ext/native/NativeC/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 {
 
@@ -13,4 +13,4 @@ public static void main(String[] args) throws Exception {
 		}
 	}
 
-}
+}
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
@@ -21,28 +21,25 @@
     <dependency>
       <groupId>org.moeaframework</groupId>
       <artifactId>moeaframework</artifactId>
-      <version>4.5</version>
-    </dependency>
-    <dependency>
-      <groupId>org.moeaframework</groupId>
-      <artifactId>gd</artifactId>
-      <version>2.0</version>
+      <version>5.0</version>
     </dependency>
     <dependency>
       <groupId>org.moeaframework</groupId>
       <artifactId>jmetal-plugin</artifactId>
-      <version>6.2.3</version>
+      <version>6.6.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.moeaframework</groupId>
       <artifactId>pisa-plugin</artifactId>
-      <version>2.0.0</version>
+      <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
diff --git a/src/test/java/org/moeaframework/integration/PISATest.java b/src/test/java/org/moeaframework/integration/PISATest.java
diff --git a/src/test/java/org/moeaframework/integration/RealWorldBenchmarksTest.java b/src/test/java/org/moeaframework/integration/RealWorldBenchmarksTest.java

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
`@@ -1,7 +1,7 @@`
`1`	`1`	`package org.moeaframework.benchmark;`
`2`	`2`
`3`	`3`	`import org.moeaframework.algorithm.NSGAII;`
`4`		`-import org.moeaframework.core.Problem;`
	`4`	`+import org.moeaframework.problem.Problem;`
`5`	`5`
`6`	`6`	`public class Example {`
`7`	`7`
`@@ -13,4 +13,4 @@ public static void main(String[] args) throws Exception {`
`13`	`13`	`}`
`14`	`14`	`}`
`15`	`15`
`16`		`-}`
	`16`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+org.moeaframework.benchmark.NativeCPPProvider`