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

Timestamp:

07/10/17 21:36:03 (7 years ago)

Author:

pkimmesw

Message:

#2665 Fixed small issues, testet benchmark suite, added INX Expressions

Location:

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

Files:

• CodeGeneratorUtils.cs (modified) (1 diff)
• RecursiveCodeGenerator.cs (modified) (2 diffs)

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

@@ -38 +38 @@
       IRandom random,
       IReadOnlyErcOptions ercOptions) {
-      var x = random.NextDouble();
-      Expression expression = null;
+      //var x = random.NextDouble();
+      //Expression expression = null;
 
-      if (x < ercOptions.ErcProbability) {
-        var expressionType = ExpressionTable.NameToTypeTable[expressionName];
-        expression = CreateRandomErcExpression(
-            ExpressionTable.TypeToAttributeTable[expressionType].StackType,
-            random,
-            ercOptions);
-      }
+      //if (x < ercOptions.ErcProbability) {
+      //  var expressionType = ExpressionTable.NameToTypeTable[expressionName];
+      //  expression = CreateRandomErcExpression(
+      //      ExpressionTable.TypeToAttributeTable[expressionType].StackType,
+      //      random,
+      //      ercOptions);
+      //}
 
-      if (expression == null || expression is ExecNoopExpression) {
-        expression = ExpressionTable.GetExpression(expressionName);
-      }
+      //if (expression == null || expression is ExecNoopExpression) {
+      //  expression = ExpressionTable.GetExpression(expressionName);
+      //}
+
+      //return expression;
+
+      var expression = ExpressionTable.GetExpression(expressionName);
 
       return expression;

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

@@ -23 +23 @@
       var code = RandomCode(maxPoints, random, pushGpConfiguration, customExpressions);
 
-      return PushProgram.Create(pool, code.ToArray());
+      return PushProgram.Create(pool, code.ToList());
     }
 
@@ -29 +29 @@
       var code = RandomCode(maxPoints, random, pushGpConfiguration, customExpressions);
 
-      return new PushProgram(code.ToArray());
+      return new PushProgram(code.ToList());
     }