From e5fc50703bd608dcf92e09483e0231a7588db8f0 Mon Sep 17 00:00:00 2001 From: Marcel Kronfeld Date: Wed, 27 Feb 2008 12:55:50 +0000 Subject: [PATCH] Cleaned r13 bug in multimodal benchmarks --- src/javaeva/client/EvAClient.java | 2 +- src/javaeva/server/go/problems/FM0Problem.java | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/javaeva/client/EvAClient.java b/src/javaeva/client/EvAClient.java index bc1d35a7..f8977955 100644 --- a/src/javaeva/client/EvAClient.java +++ b/src/javaeva/client/EvAClient.java @@ -583,7 +583,7 @@ public class EvAClient implements RemoteStateListener, Serializable { System.setProperty("java.class.path", cp + System.getProperty("path.separator") + baseDir.getPath()); ReflectPackage.resetDynCP(); m_ComAdapter.updateLocalMainAdapter(); - loadSpecificModule(selectedModule); // warning! end recursive call! handle with care! + loadSpecificModule(selectedModule); // end recursive call! handle with care! return; } showLoadModules = true; diff --git a/src/javaeva/server/go/problems/FM0Problem.java b/src/javaeva/server/go/problems/FM0Problem.java index 3c418208..617f4fac 100644 --- a/src/javaeva/server/go/problems/FM0Problem.java +++ b/src/javaeva/server/go/problems/FM0Problem.java @@ -122,9 +122,9 @@ public class FM0Problem extends F1Problem implements Interface2DBorderProblem, I * @param x The n-dimensional input vector * @return The m-dimensional output vector. */ - public double[] doEvaluation(double[] x) { + public double[] eval(double[] x) { double[] result = new double[1]; - result[0] = this.m_GlobalOpt - doEvaluationUnNormalized(x)[0]; + result[0] = this.m_GlobalOpt - evalUnnormalized(x)[0]; return result; } @@ -132,7 +132,7 @@ public class FM0Problem extends F1Problem implements Interface2DBorderProblem, I * @param x The n-dimensional input vector * @return The m-dimensional output vector. */ - public double[] doEvaluationUnNormalized(double[] x) { + public double[] evalUnnormalized(double[] x) { double[] result = new double[1]; result[0] = Math.sin(2*x[0] - 0.5*Math.PI) + 1 + 2*Math.cos(x[1]) + 0.5*x[0]; return result; @@ -197,7 +197,7 @@ public class FM0Problem extends F1Problem implements Interface2DBorderProblem, I InterfaceDataTypeDouble tmpIndy; tmpIndy = (InterfaceDataTypeDouble)((AbstractEAIndividual)this.m_Template).clone(); tmpIndy.SetDoubleDataLamarkian(point); - ((AbstractEAIndividual)tmpIndy).SetFitness(this.doEvaluationUnNormalized(point)); + ((AbstractEAIndividual)tmpIndy).SetFitness(this.evalUnnormalized(point)); this.m_GlobalOpt = Math.max(this.m_GlobalOpt, ((AbstractEAIndividual)tmpIndy).getFitness(0)); this.m_Optima.add(tmpIndy); } @@ -315,7 +315,7 @@ public class FM0Problem extends F1Problem implements Interface2DBorderProblem, I * @return double */ public double functionValue(double[] point) { - return doEvaluationUnNormalized(point)[0]; + return evalUnnormalized(point)[0]; } /** This method returns this min and may fitness occuring * @return double[]