halfdan/eva2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cleaned r13 bug in multimodal benchmarks

Browse Source
This commit is contained in:
Marcel Kronfeld 2008-02-27 12:55:50 +00:00
parent 41cd0a8cb8
commit e5fc50703b
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/javaeva/client/EvAClient.java
View File

@ -583,7 +583,7 @@ public class EvAClient implements RemoteStateListener, Serializable {
System.setProperty("java.class.path", cp + System.getProperty("path.separator") + baseDir.getPath()); System.setProperty("java.class.path", cp + System.getProperty("path.separator") + baseDir.getPath());
ReflectPackage.resetDynCP(); ReflectPackage.resetDynCP();
m_ComAdapter.updateLocalMainAdapter(); m_ComAdapter.updateLocalMainAdapter();
loadSpecificModule(selectedModule); // warning! end recursive call! handle with care! loadSpecificModule(selectedModule); // end recursive call! handle with care!
return; return;
} }
showLoadModules = true; showLoadModules = true;

10
src/javaeva/server/go/problems/FM0Problem.java
View File

@ -122,9 +122,9 @@ public class FM0Problem extends F1Problem implements Interface2DBorderProblem, I
* @param x The n-dimensional input vector * @param x The n-dimensional input vector
* @return The m-dimensional output vector. * @return The m-dimensional output vector.
*/ */
public double[] doEvaluation(double[] x) { public double[] eval(double[] x) {
double[] result = new double[1]; double[] result = new double[1];
result[0] = this.m_GlobalOpt - doEvaluationUnNormalized(x)[0]; result[0] = this.m_GlobalOpt - evalUnnormalized(x)[0];
return result; return result;
} }
@ -132,7 +132,7 @@ public class FM0Problem extends F1Problem implements Interface2DBorderProblem, I
* @param x The n-dimensional input vector * @param x The n-dimensional input vector
* @return The m-dimensional output vector. * @return The m-dimensional output vector.
*/ */
public double[] doEvaluationUnNormalized(double[] x) { public double[] evalUnnormalized(double[] x) {
double[] result = new double[1]; 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]; result[0] = Math.sin(2*x[0] - 0.5*Math.PI) + 1 + 2*Math.cos(x[1]) + 0.5*x[0];
return result; return result;
@ -197,7 +197,7 @@ public class FM0Problem extends F1Problem implements Interface2DBorderProblem, I
InterfaceDataTypeDouble tmpIndy; InterfaceDataTypeDouble tmpIndy;
tmpIndy = (InterfaceDataTypeDouble)((AbstractEAIndividual)this.m_Template).clone(); tmpIndy = (InterfaceDataTypeDouble)((AbstractEAIndividual)this.m_Template).clone();
tmpIndy.SetDoubleDataLamarkian(point); 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_GlobalOpt = Math.max(this.m_GlobalOpt, ((AbstractEAIndividual)tmpIndy).getFitness(0));
this.m_Optima.add(tmpIndy); this.m_Optima.add(tmpIndy);
} }
@ -315,7 +315,7 @@ public class FM0Problem extends F1Problem implements Interface2DBorderProblem, I
* @return double * @return double
*/ */
public double functionValue(double[] point) { public double functionValue(double[] point) {
return doEvaluationUnNormalized(point)[0]; return evalUnnormalized(point)[0];
} }
/** This method returns this min and may fitness occuring /** This method returns this min and may fitness occuring
* @return double[] * @return double[]