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

Timestamp:

04/18/17 01:15:25 (7 years ago)

Author:

pkimmesw

Message:

#2665 BenchmarkSuite, all examples, partially tested, VectorExpressions added

Location:

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

Files:

• CodeGenerator/CodeGeneratorUtils.cs (modified) (3 diffs)
• ErcUtils.cs (modified) (1 diff)
• StringGenerator.cs (modified) (1 diff)

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

@@ -3 +3 @@
 
 namespace HeuristicLab.Problems.ProgramSynthesis.Push.Generators.CodeGenerator {
+
   using HeuristicLab.Core;
-  using HeuristicLab.Problems.ProgramSynthesis.Push.Erc.Interfaces;
+  using HeuristicLab.Problems.ProgramSynthesis.Base.Erc.Interfaces;
   using HeuristicLab.Problems.ProgramSynthesis.Push.Expressions;
   using HeuristicLab.Problems.ProgramSynthesis.Push.Stack;
 
   internal static class CodeGeneratorUtils {
-    internal static Expression CreateExpression(IRandom random, IReadOnlyList<string> enabledExpressions, IDictionary<string, Expression> customExpressions = null) {
-      var customCount = customExpressions == null ? 0 : customExpressions.Count;
-      var index = random.Next(0, enabledExpressions.Count + customCount);
-
-      if ((index >= 0) && (index < enabledExpressions.Count)) {
-        var name = enabledExpressions[index];
-        return ExpressionTable.GetExpression(name);
-      }
-
-      return customExpressions.ElementAt(index - (enabledExpressions.Count - 1)).Value;
-    }
-
     internal static Expression CreateExpressionOrErc(
       IRandom random,
@@ -26 +15 @@
       IReadOnlyErcOptions ercOptions,
       IDictionary<string, Expression> customExpressions = null) {
-      var expression = CreateExpression(random, enabledExpressions, customExpressions);
-      return CreateExpressionOrErc(expression, random, ercOptions);
+      var customCount = customExpressions == null ? 0 : customExpressions.Count;
+      var index = random.Next(enabledExpressions.Count + customCount);
+
+      return index >= enabledExpressions.Count
+        ? customExpressions.ElementAt(index - (enabledExpressions.Count - 1)).Value
+        : CreateExpressionOrErc(index, random, enabledExpressions, ercOptions);
     }
 
@@ -36 +29 @@
       IReadOnlyErcOptions ercOptions) {
       var name = enabledExpressions[index];
-      var expression = ExpressionTable.GetExpression(name);
 
-      return CreateExpressionOrErc(expression, random, ercOptions);
+      return CreateExpressionOrErc(name, random, ercOptions);
     }
 
     private static Expression CreateExpressionOrErc(
-      Expression expression,
+      string expressionName,
       IRandom random,
       IReadOnlyErcOptions ercOptions) {
       var x = random.NextDouble();
+      Expression expression = null;
 
       if (x < ercOptions.ErcProbability) {
-        var tmp = CreateRandomErcExpression(
-            ExpressionTable.TypeToAttributeTable[expression.GetType()].StackType,
+        var expressionType = ExpressionTable.NameToTypeTable[expressionName];
+        expression = CreateRandomErcExpression(
+            ExpressionTable.TypeToAttributeTable[expressionType].StackType,
             random,
             ercOptions);
+      }
 
-        if (!(tmp is ExecNoopExpression)) {
-          expression = tmp;
-        }
+      if (expression == null || expression is ExecNoopExpression) {
+        expression = ExpressionTable.GetExpression(expressionName);
       }
 

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

@@ -1 +1 @@
 namespace HeuristicLab.Problems.ProgramSynthesis.Push.Generators {
   using HeuristicLab.Core;
-  using HeuristicLab.Problems.ProgramSynthesis.Push.Erc.Interfaces;
+  using HeuristicLab.Problems.ProgramSynthesis.Base.Erc.Interfaces;
 
   internal static class ErcUtils {

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

@@ -4 +4 @@
 
   using HeuristicLab.Core;
-  using HeuristicLab.Problems.ProgramSynthesis.Push.Erc.Interfaces;
+  using HeuristicLab.Problems.ProgramSynthesis.Base.Erc.Interfaces;
   using HeuristicLab.Random;