Read epsilons and default max evaluations

MOEAFramework · Oct 21, 2024 · 5d4a592 · 5d4a592
1 parent d3edc04
commit 5d4a592
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/main/java/org/moeaframework/algorithm/jmetal/JMetalAlgorithms.java b/src/main/java/org/moeaframework/algorithm/jmetal/JMetalAlgorithms.java
@@ -33,6 +33,8 @@
 import org.moeaframework.algorithm.jmetal.adapters.JMetalAlgorithmAdapter;
 import org.moeaframework.algorithm.jmetal.adapters.PermutationProblemAdapter;
 import org.moeaframework.algorithm.jmetal.adapters.ProblemAdapter;
+import org.moeaframework.core.DefaultEpsilons;
+import org.moeaframework.core.Epsilons;
 import org.moeaframework.core.Settings;
 import org.moeaframework.core.Solution;
 import org.moeaframework.core.TypedProperties;
@@ -576,10 +578,16 @@ private Algorithm newOMOPSO(TypedProperties properties, Problem problem) throws
 
 		SolutionListEvaluator evaluator = new SequentialSolutionListEvaluator();
 
+		Epsilons epsilons = DefaultEpsilons.getInstance().getEpsilons(problem);
+
+		if (epsilons.size() != 1) {
+			System.err.println("Multiple epsilon values configured for problem, but JMetal only supports 1");
+		}
+
 		OMOPSOBuilder builder = new OMOPSOBuilder(adapter, evaluator)
 				.setUniformMutation(uniformMutation)
         		.setNonUniformMutation(nonUniformMutation)
-        		.setEta(properties.getDouble("epsilon", 0.0075));
+        		.setEta(properties.getDouble("epsilon", epsilons.get(0)));
 		loadProperties(properties, builder);
 
 		return new JMetalAlgorithmAdapter(builder.build(), properties, adapter);

diff --git a/src/main/java/org/moeaframework/algorithm/jmetal/adapters/JMetalAlgorithmAdapter.java b/src/main/java/org/moeaframework/algorithm/jmetal/adapters/JMetalAlgorithmAdapter.java
@@ -23,6 +23,7 @@
 import org.moeaframework.algorithm.Algorithm;
 import org.moeaframework.algorithm.AlgorithmException;
 import org.moeaframework.algorithm.extension.Extensions;
+import org.moeaframework.core.Settings;
 import org.moeaframework.core.Solution;
 import org.moeaframework.core.TypedProperties;
 import org.moeaframework.core.population.NondominatedPopulation;
@@ -68,7 +69,8 @@ public JMetalAlgorithmAdapter(
 			ProblemAdapter<T> problem) {
 		super();
 		this.algorithm = algorithm;
-		this.maxEvaluations = (int)properties.getDouble("maxEvaluations", 25000);
+		this.maxEvaluations = (int)properties.getDouble("maxEvaluations",
+				Settings.DEFAULT_MAX_FUNCTION_EVALUATIONS);
 		this.problem = problem;
 	}