Changeset 15273 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Individual

Timestamp:

07/19/17 12:55:58 (8 years ago)

Author:

pkimmesw

Message:

#2665 Started Plush Encoding, Added Zero Error Individual Count Analyzer

Location:

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Individual

Files:

• IndividualExtensions.cs (modified) (2 diffs)
• InduvidualMapper.cs (modified) (1 diff)

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Individual/IndividualExtensions.cs

@@ -6 +6 @@
   using HeuristicLab.Optimization;
   using HeuristicLab.Problems.ProgramSynthesis.Push.Configuration;
-  using HeuristicLab.Problems.ProgramSynthesis.Push.Data.Pool;
   using HeuristicLab.Problems.ProgramSynthesis.Push.Expressions;
   using HeuristicLab.Problems.ProgramSynthesis.Push.Generators.CodeGenerator;
-  using HeuristicLab.Random;
+  using HeuristicLab.Problems.ProgramSynthesis.Push.SolutionCreator;
 
   public static class IndividualExtensions {
-    public static PushProgram ToPushProgram(this Individual individual, IReadOnlyPushConfiguration config, ObjectPool<IRandom> randomPool) {
-      return individual.IntegerVector().ToPushProgram(config, randomPool);
-    }
-
-    public static PushProgram ToPushProgram(this Individual individual, IReadOnlyPushConfiguration config) {
-      return individual.IntegerVector().ToPushProgram(config);
-    }
 
     public static PushProgram ToPushProgram(this Individual individual, IReadOnlyPushConfiguration config, IRandom random) {
       return individual.IntegerVector().ToPushProgram(config, random);
-    }
-
-    public static PushProgram ToPushProgram(this IntegerVector vector, IReadOnlyPushConfiguration config, ObjectPool<IRandom> randomPool) {
-      var random = randomPool.Allocate();
-      var seed = vector.GetSeed();
-
-      random.Reset(seed);
-      var program = vector.ToPushProgram(config, random);
-      randomPool.Free(random);
-
-      return program;
-    }
-
-    public static PushProgram ToPushProgram(this IntegerVector vector, IReadOnlyPushConfiguration config) {
-      var seed = (uint)vector.GetSeed();
-      return vector.ToPushProgram(config, new MersenneTwister(seed));
-    }
-
-    public static int GetSeed(this IntegerVector vector) {
-      var seed = 17;
-      for (var i = 0; i < vector.Length; i++)
-        seed = seed * 23 + vector[i];
-      return seed;
     }
 
@@ -53 +22 @@
 
       for (var i = vector.Length - 1; i >= 0; i--) {
-        var expression = CodeGeneratorUtils.CreateExpressionOrErc(
-          vector[i],
+        var index = vector[i];
+
+        if (index == PushSolutionEncoding.End)
+          break;
+
+        // skip noops
+        if (index == PushSolutionEncoding.Noop)
+          continue;
+
+        var expression = CodeGeneratorUtils.MapToExpression(
+          index,
           random,
-          config.EnabledExpressions,
-          config.ErcOptions);
+          config.ErcOptions,
+          config);
 
         expressions.Add(expression);

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Individual/InduvidualMapper.cs

@@ -39 +39 @@
 
       for (; currentIndex < vector.Length; currentIndex++) {
-        var expression = CodeGeneratorUtils.CreateExpressionOrErc(
+        var expression = CodeGeneratorUtils.MapToExpression(
           vector[currentIndex] % config.EnabledExpressions.Count,
           random,
-          config.EnabledExpressions,
-          config.ErcOptions);
+          config.ErcOptions,
+          config);
 
         var expressionType = expression.GetType();