Changeset 15017 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Problem/IndividualMapper.cs

Timestamp:

06/01/17 09:28:34 (7 years ago)

Author:

pkimmesw

Message:

#2665 Fixed Benchmark Problem Definition, Converted LoopExpressions to stateless expressions, Added several unit test to ensure funcionality, Fixed UI bugs

File:

• branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Problem/IndividualMapper.cs (modified) (4 diffs)

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Problem/IndividualMapper.cs

@@ -1 +1 @@
 namespace HeuristicLab.Problems.ProgramSynthesis.Push.Problem {
+  using System.Collections.Generic;
 
   using HeuristicLab.Core;
@@ -7 +8 @@
   using HeuristicLab.Problems.ProgramSynthesis.Push.Data.Pool;
   using HeuristicLab.Problems.ProgramSynthesis.Push.Expressions;
+  using HeuristicLab.Problems.ProgramSynthesis.Push.Extensions;
   using HeuristicLab.Problems.ProgramSynthesis.Push.Generators.CodeGenerator;
   using HeuristicLab.Random;
@@ -17 +19 @@
     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);
     }
 
@@ -35 +41 @@
     }
 
-    private static int GetSeed(this IntegerVector vector) {
-      var seed = 0;
+    public static int GetSeed(this IntegerVector vector) {
+      var seed = 17;
       for (var i = 0; i < vector.Length; i++)
-        seed += (i + 1) * vector[i];
+        seed = seed * 23 + vector[i];
       return seed;
     }
 
-    private static PushProgram ToPushProgram(this IntegerVector vector, IReadOnlyPushConfiguration config, IRandom random) {
-      var enabledExpressions = config.EnabledExpressions;
-      var ercOptions = config.ErcOptions;
-      //var programLength = random.Next(config.MinPointsInProgram, config.MaxPointsInProgram + 1);
-      var expressions = new Expression[vector.Length];
+    public static PushProgram ToPushProgram(this IntegerVector vector, IReadOnlyPushConfiguration config, IRandom random) {
+      var currentIndex = 0;
+      var close = 0;
 
-      for (var i = 0; i < vector.Length; i++)
-        expressions[i] = CodeGeneratorUtils.CreateExpressionOrErc(vector[i], random, enabledExpressions, ercOptions);
+      return FromPlush(vector, ref currentIndex, ref close, 0, config, random);
+    }
+
+    private static PushProgram FromPlush(IntegerVector vector, ref int currentIndex, ref int close, int depth, IReadOnlyPushConfiguration config, IRandom random) {
+      if (currentIndex >= vector.Length)
+        return PushProgram.Empty;
+
+      var expressions = new List<Expression>();
+
+      for (; currentIndex < vector.Length; currentIndex++) {
+        var expression = CodeGeneratorUtils.CreateExpressionOrErc(
+          vector[currentIndex] % config.EnabledExpressions.Count,
+          random,
+          config.EnabledExpressions,
+          config.ErcOptions);
+
+        var expressionType = expression.GetType();
+        close += random.NextBiased(0, config.MaxParenthesesClose, config.ParenthesesCloseBiasLevel);
+
+
+        // check if expression requires additional blocks
+        if (ExpressionTable.TypeToAttributeTable.ContainsKey(expressionType)) {
+          var attr = ExpressionTable.TypeToAttributeTable[expressionType];
+
+          for (var blockIdx = 0u; blockIdx < attr.ExecIn && currentIndex < vector.Length; blockIdx++) {
+            if (close != 0) {
+              close--;
+              expressions.Add(PushProgram.Empty);
+            } else {
+              currentIndex++;
+              var subProgram = FromPlush(vector, ref currentIndex, ref close, depth + 1, config, random);
+              var subExpression = subProgram.Count == 1 ? subProgram.Expressions[0] : subProgram;
+              expressions.Add(subExpression);
+            }
+          }
+        }
+
+        expressions.Add(expression);
+
+        if (close > 0 && depth > 0) {
+          close--;
+          break;
+        }
+
+        if (depth == 0) {
+          close = 0;
+        }
+      }
 
       return new PushProgram(expressions);