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

Fix of IPOP-ES and deact. debug output for AbstractParameterControl

Browse Source
This commit is contained in:
Marcel Kronfeld 2009-03-17 18:46:37 +00:00
parent 8bb6f38c79
commit 6592ed69f2
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/eva2/server/go/operators/paramcontrol/AbstractParameterControl.java
View File

@ -13,7 +13,7 @@ import eva2.gui.BeanInspector;
*/ */
public abstract class AbstractParameterControl implements InterfaceParameterControl { public abstract class AbstractParameterControl implements InterfaceParameterControl {
public Object[] initialValues = null; public Object[] initialValues = null;
protected static boolean TRACE=true; protected static boolean TRACE=false;
public void init(Object obj) { public void init(Object obj) {
String[] params = getControlledParameters(); String[] params = getControlledParameters();

14
src/eva2/server/go/strategies/EvolutionStrategyIPOP.java
View File

@ -149,9 +149,9 @@ public class EvolutionStrategyIPOP extends EvolutionStrategies implements Interf
setMu((initialLambda/2)+1); setMu((initialLambda/2)+1);
System.err.println("Warning, too small initial lambda, adapting mu to " + getMu()); System.err.println("Warning, too small initial lambda, adapting mu to " + getMu());
} }
super.setLambda(initialLambda);
checkPopulationConstraints(); checkPopulationConstraints();
setForceOrigPopSize(false); setForceOrigPopSize(false);
super.setLambda(initialLambda);
getPopulation().setNotifyEvalInterval(initialLambda); getPopulation().setNotifyEvalInterval(initialLambda);
super.init(); super.init();
bestList = new LinkedList<AbstractEAIndividual>(); bestList = new LinkedList<AbstractEAIndividual>();
@ -244,12 +244,12 @@ public class EvolutionStrategyIPOP extends EvolutionStrategies implements Interf
public String globalInfo() { public String globalInfo() {
return "An ES with increasing population size."; return "An ES with increasing population size.";
} }
//
protected void checkPopulationConstraints() { // protected void checkPopulationConstraints() {
if (getLambda()!=initialLambda) setLambda(initialLambda); // if (getLambda()!=initialLambda) setLambda(initialLambda);
if (getMu()>getLambda()) System.err.println("Invalid mu/lambda ratio!"); // if (getMu()>getLambda()) System.err.println("Invalid mu/lambda ratio!");
super.checkPopulationConstraints(); // super.checkPopulationConstraints();
} // }
/** Set an initial population size (if smaller lambda this is ignored). /** Set an initial population size (if smaller lambda this is ignored).
* @param l The inital population size. * @param l The inital population size.