From 6592ed69f200968cb23102cb0c8cd60be840aa20 Mon Sep 17 00:00:00 2001
From: Marcel Kronfeld <makron@gmx.net>
Date: Tue, 17 Mar 2009 18:46:37 +0000
Subject: [PATCH] Fix of IPOP-ES and deact. debug output for
 AbstractParameterControl

---
 .../paramcontrol/AbstractParameterControl.java     |  2 +-
 .../go/strategies/EvolutionStrategyIPOP.java       | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/eva2/server/go/operators/paramcontrol/AbstractParameterControl.java b/src/eva2/server/go/operators/paramcontrol/AbstractParameterControl.java
index 1d02f4ce..d54968f3 100644
--- a/src/eva2/server/go/operators/paramcontrol/AbstractParameterControl.java
+++ b/src/eva2/server/go/operators/paramcontrol/AbstractParameterControl.java
@@ -13,7 +13,7 @@ import eva2.gui.BeanInspector;
  */
 public abstract class AbstractParameterControl implements InterfaceParameterControl {
 	public Object[] initialValues = null;
-	protected static boolean TRACE=true;
+	protected static boolean TRACE=false;
 	
 	public void init(Object obj) {
 		String[] params = getControlledParameters();
diff --git a/src/eva2/server/go/strategies/EvolutionStrategyIPOP.java b/src/eva2/server/go/strategies/EvolutionStrategyIPOP.java
index 447e221c..8460cc4c 100644
--- a/src/eva2/server/go/strategies/EvolutionStrategyIPOP.java
+++ b/src/eva2/server/go/strategies/EvolutionStrategyIPOP.java
@@ -149,9 +149,9 @@ public class EvolutionStrategyIPOP extends EvolutionStrategies implements Interf
     		setMu((initialLambda/2)+1);
     		System.err.println("Warning, too small initial lambda, adapting mu to " + getMu());
     	}
+    	super.setLambda(initialLambda);
     	checkPopulationConstraints();
 		setForceOrigPopSize(false);
-    	super.setLambda(initialLambda);
     	getPopulation().setNotifyEvalInterval(initialLambda);
     	super.init();
     	bestList = new LinkedList<AbstractEAIndividual>();
@@ -244,12 +244,12 @@ public class EvolutionStrategyIPOP extends EvolutionStrategies implements Interf
 	public String globalInfo() {
 		return "An ES with increasing population size.";
 	}
-	
-	protected void checkPopulationConstraints() {
-		if (getLambda()!=initialLambda) setLambda(initialLambda);
-		if (getMu()>getLambda()) System.err.println("Invalid mu/lambda ratio!");
-		super.checkPopulationConstraints();
-	}
+//	
+//	protected void checkPopulationConstraints() {
+//		if (getLambda()!=initialLambda) setLambda(initialLambda);
+//		if (getMu()>getLambda()) System.err.println("Invalid mu/lambda ratio!");
+//		super.checkPopulationConstraints();
+//	}
 	
 	/** Set an initial population size (if smaller lambda this is ignored).
      * @param l    The inital population size.