Changeset 14897 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Generators

Timestamp:

04/28/17 22:52:08 (8 years ago)

Author:

pkimmesw

Message:

#2665 Dynamic ErcValues, Separate Push from BenchmarkSuite Push

Location:

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

Files:

• CodeGenerator/CodeGeneratorUtils.cs (modified) (4 diffs)
• ErcUtils.cs (deleted)
• StringGenerator.cs (deleted)

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

@@ -3 +3 @@
 
 namespace HeuristicLab.Problems.ProgramSynthesis.Push.Generators.CodeGenerator {
+  using Core;
+  using Expressions;
 
-  using HeuristicLab.Core;
-  using HeuristicLab.Problems.ProgramSynthesis.Base.Erc.Interfaces;
-  using HeuristicLab.Problems.ProgramSynthesis.Push.Expressions;
-  using HeuristicLab.Problems.ProgramSynthesis.Push.Stack;
+  using HeuristicLab.Problems.ProgramSynthesis.Base.Erc;
+
+  using Stack;
 
   internal static class CodeGeneratorUtils {
@@ -19 +20 @@
 
       return index >= enabledExpressions.Count
-        ? customExpressions.ElementAt(index - (enabledExpressions.Count - 1)).Value
+        ? customExpressions.Values.ElementAt(index - enabledExpressions.Count)
         : CreateExpressionOrErc(index, random, enabledExpressions, ercOptions);
     }
@@ -55 +56 @@
     }
 
+    private static readonly Expression Noop = ExpressionTable.GetStatelessExpression<ExecNoopExpression>();
     /// <summary>
     /// Create a ErcExpression whereby the type of the expression conforms to the passed stack type.
@@ -65 +67 @@
       switch (type) {
         case StackTypes.Integer:
-          if (ercOptions.IntegerErcOptions == null || !ercOptions.IntegerErcOptions.IsEnabled)
-            return ExpressionTable.GetStatelessExpression<ExecNoopExpression>();
-
-          var intValue = ErcUtils.GetInteger(ercOptions.IntegerErcOptions, random);
-
-          return new IntegerPushExpression(intValue);
+          return ercOptions.IntegerErcOptions == null || !ercOptions.IntegerErcOptions.IsEnabled
+             ? Noop
+             : new IntegerPushExpression(ercOptions.IntegerErcOptions.GetErcValue(random));
 
         case StackTypes.Float:
-          if (ercOptions.FloatErcOptions == null || !ercOptions.FloatErcOptions.IsEnabled)
-            return ExpressionTable.GetStatelessExpression<ExecNoopExpression>();
-
-          var doubleValue = ErcUtils.GetDouble(ercOptions.FloatErcOptions, random);
-
-          return new FloatPushExpression(doubleValue);
+          return ercOptions.FloatErcOptions == null || !ercOptions.FloatErcOptions.IsEnabled
+            ? Noop
+            : new FloatPushExpression(ercOptions.FloatErcOptions.GetErcValue(random));
 
         case StackTypes.Boolean:
           return ercOptions.BooleanErcOptions == null || !ercOptions.BooleanErcOptions.IsEnabled
-            ? ExpressionTable.GetStatelessExpression<ExecNoopExpression>()
-            : new BooleanPushExpression(ErcUtils.GetBoolean(ercOptions.BooleanErcOptions, random));
+            ? Noop
+            : new BooleanPushExpression(ercOptions.BooleanErcOptions.GetErcValue(random));
 
         case StackTypes.Name:
           return ercOptions.NameErcOptions == null || !ercOptions.NameErcOptions.IsEnabled
-            ? ExpressionTable.GetStatelessExpression<ExecNoopExpression>()
-            : new NamePushExpression(ErcUtils.GetName(ercOptions.NameErcOptions, random));
+            ? Noop
+            : new NamePushExpression(ercOptions.NameErcOptions.GetErcValue(random));
 
         case StackTypes.String:
           return ercOptions.StringErcOptions == null || !ercOptions.StringErcOptions.IsEnabled
-            ? ExpressionTable.GetStatelessExpression<ExecNoopExpression>()
-            : new StringPushExpression(ErcUtils.GetString(ercOptions.StringErcOptions, random));
+            ? Noop
+            : new StringPushExpression(ercOptions.StringErcOptions.GetErcValue(random));
 
         case StackTypes.Char:
           return ercOptions.CharErcOptions == null || !ercOptions.CharErcOptions.IsEnabled
-            ? ExpressionTable.GetStatelessExpression<ExecNoopExpression>()
-            : new CharPushExpression(ErcUtils.GetChar(ercOptions.CharErcOptions, random));
+            ? Noop
+            : new CharPushExpression(ercOptions.CharErcOptions.GetErcValue(random));
 
         default:
-          return ExpressionTable.GetStatelessExpression<ExecNoopExpression>();
+          return Noop;
       }
     }