Changeset 15289 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Generators/CodeGenerator

Timestamp:

07/26/17 19:34:13 (7 years ago)

Author:

pkimmesw

Message:

#2665 Fixed analyzer, fixed Plush encoding + operators, adpated print evaluation according to McPhee

Location:

branches/PushGP/HeuristicLab.PushGP

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.ProgramSynthesis/Push/Generators/CodeGenerator/CodeGeneratorUtils.cs (modified) (2 diffs)

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Generators/CodeGenerator/CodeGeneratorUtils.cs

@@ -28 +28 @@
         ? customExpressions.Values.ElementAt(index - enabledExpressionCount)
         : MapToExpression(index, random, ercOptions, config);
+    }
+
+    internal static Expression MapToExpression(
+      int index,
+      IReadOnlyExpressionsConfiguration config) {
+
+      switch (index) {
+        case PushSolutionEncoding.Noop:
+          return Noop;
+      }
+
+      var name = config.EnabledExpressions[index];
+      return ExpressionTable.GetExpression(name);
     }
 
@@ -76 +89 @@
         instructions.InExpressionCount > 0) {
 
-        var nr = random.Next(0, instructions.InExpressionCount) + 1;
-        expression = ExpressionTable.InExpressionTable[nr];
+        var index = random.Next(0, instructions.InExpressionCount);
+        expression = ExpressionTable.InExpressionTable[index];
       } else {
         expression = GetRandomExpression(random, instructions);