Changeset 57 for java/ecj/framsticks/FramsticksIndividual.java

Timestamp:

01/26/10 15:27:17 (14 years ago)

Author:

mszubert

Message:

Population initialization parametrized - getSimplest macro is called with an appropriate additional parameter specifying initialization type.

File:

• java/ecj/framsticks/FramsticksIndividual.java (modified) (2 diffs)

java/ecj/framsticks/FramsticksIndividual.java

@@ -11 +11 @@
 public class FramsticksIndividual extends Individual {
 
-        public static final String P_FRAMSTICKS_INDIVIDUAL = "framssticks-ind";
+        private static final String P_FRAMSTICKS_INDIVIDUAL = "framsticks-ind";
+        private static final String P_INIT_TYPE = "init-type"; 
 
         public String genotype;
@@ -39 +40 @@
         public void setup(final EvolutionState state, final Parameter base) {
                 super.setup(state, base);
-                genotype = FramsticksUtils.getInstance(state).getNewGenotype();
+                
+                Parameter initTypeParam = base.push(P_INIT_TYPE);
+                int initializationType = state.parameters.getIntWithDefault(initTypeParam, null, 0);
+                genotype = FramsticksUtils.getInstance(state).getNewGenotype(initializationType);
         }