Changeset 57 for java

Timestamp:

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

Author:

mszubert

Message:

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

Location:

java/ecj/framsticks

Files:

• FramsticksIndividual.java (modified) (2 diffs)
• FramsticksUtils.java (modified) (2 diffs)
• frams_coevolution2.params (modified) (3 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);
         }
 

java/ecj/framsticks/FramsticksUtils.java

@@ -18 +18 @@
 public class FramsticksUtils {
 
-        private static final String NEW_CMD = "%s \"getsimplest 1\" -q";
+        private static final String NEW_CMD = "%s \"getsimplest 1 %s\" -q";
         private static final String EVAL_CMD = "%s \"ex %s\" \"eval %s %s\" -q";
         private static final String MUTATE_CMD = "%s rnd mut -q < %s";
@@ -183 +183 @@
         }
 
-        public String getNewGenotype() {
-                return executeCommand(String.format(NEW_CMD, executableCommand));
+        public String getNewGenotype(int initializationType) {
+                return executeCommand(String.format(NEW_CMD, executableCommand, initializationType));
         }
 

java/ecj/framsticks/frams_coevolution2.params

@@ -24 +24 @@
 pop.subpop.1    = ec.Subpopulation
 
-pop.subpop.0.size         = 8
-pop.subpop.1.size         = 8
+pop.subpop.0.size         = 1
+pop.subpop.1.size         = 1
 pop.subpop.0.duplicate-retries  = 0
 pop.subpop.1.duplicate-retries  = 0
@@ -34 +34 @@
 pop.subpop.0.species.crossover-prob = 1.0
 pop.subpop.0.species.mutation-prob  = 0.1
+pop.subpop.0.species.ind.init-type      = 2 
 
 pop.subpop.1.species            = framsticks.FramsticksSpecies
@@ -40 +41 @@
 pop.subpop.1.species.crossover-prob = 1.0
 pop.subpop.1.species.mutation-prob  = 0.1
+pop.subpop.1.species.ind.init-type      = 1 
 
 pop.subpop.0.species.pipe                   = framsticks.FramsticksMutationPipeline