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

More problem updates

Browse Source
This commit is contained in:
Marcel Kronfeld 2011-05-04 11:20:36 +00:00
parent 8d386689af
commit 45ffbc09d2
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/eva2/server/go/problems/F13Problem.java
View File

@ -31,12 +31,12 @@ public class F13Problem extends AbstractProblemDoubleOffset implements Interface
@Override @Override
public double getRangeLowerBound(int dim) { public double getRangeLowerBound(int dim) {
return -512.03; return -500; //-512.03;
} }
@Override @Override
public double getRangeUpperBound(int dim) { public double getRangeUpperBound(int dim) {
return 511.97; return 500;// 511.97;
} }
@Override @Override
@ -79,8 +79,10 @@ public class F13Problem extends AbstractProblemDoubleOffset implements Interface
} }
public SolutionHistogram getHistogram() { public SolutionHistogram getHistogram() {
// EVAERROR.errorMsgOnce("Warning: Restore line in getHistogram for evaluation on F13Problem ???");
if (getProblemDimension() < 15) return new SolutionHistogram(0, 800, 16); if (getProblemDimension() < 15) return new SolutionHistogram(0, 800, 16);
else if (getProblemDimension() < 25) return new SolutionHistogram(0, 1600, 16); else if (getProblemDimension() < 25) return new SolutionHistogram(0, 1600, 16);
// else if (getProblemDimension() < 35) return new SolutionHistogram(0, 1600, 16);
else return new SolutionHistogram(0, 3200, 12); else return new SolutionHistogram(0, 3200, 12);
} }
/********************************************************************************************************************** /**********************************************************************************************************************
@ -98,7 +100,7 @@ public class F13Problem extends AbstractProblemDoubleOffset implements Interface
* @return description * @return description
*/ */
public static String globalInfo() { public static String globalInfo() {
return "Schwefels sine-root Function (multimodal, 1981). Remember to use range check!"; return "Schwefels sine-root Function (multimodal, 1981). Remember to use range check! Note that rotating the function may make it easier because new, and better, minima may enter the search space.";
} }
public void setDefaultAccuracy(double v) { public void setDefaultAccuracy(double v) {

2
src/eva2/server/go/problems/F15Problem.java
View File

@ -34,7 +34,7 @@ public class F15Problem extends AbstractProblemDouble implements Serializable, I
x = rotateMaybe(x); x = rotateMaybe(x);
double t=0, s=0, sum=0; double t=0, s=0, sum=0;
for (int i=0; i<x.length-2; i++) { for (int i=0; i<x.length-1; i++) {
s=(x[i]-1.); s=(x[i]-1.);
t=Math.sin(Math.PI*x[i+1]); t=Math.sin(Math.PI*x[i+1]);
sum += (s*s)*(1+10.*t*t); sum += (s*s)*(1+10.*t*t);