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

Timestamp:

03/08/17 11:57:42 (7 years ago)

Author:

pkimmesw

Message:

#2665 Storable problem data, Renamings due to typos, Removed GP from class names

File:

• branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Generators/CodeGenerator.cs (modified) (6 diffs)

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

@@ -19 +19 @@
   public static class CodeGenerator {
 
-    public static PushProgram RandomProgram(int maxPoints, IRandom random = null, IReadonlyPushGpConfiguration pushGpConfiguration = null, IDictionary<string, Expression> customExpressions = null) {
+    public static PushProgram RandomProgram(int maxPoints, IRandom random = null, IReadonlyPushConfiguration pushGpConfiguration = null, IDictionary<string, Expression> customExpressions = null) {
       var code = RandomCode(maxPoints, random, pushGpConfiguration, customExpressions);
 
@@ -25 +25 @@
     }
 
-    public static ExecExpandExpression RandomExpandExpression(int maxPoints, IRandom random = null, IReadonlyPushGpConfiguration pushGpConfiguration = null, IDictionary<string, Expression> customExpressions = null) {
+    public static ExecExpandExpression RandomExpandExpression(int maxPoints, IRandom random = null, IReadonlyPushConfiguration pushGpConfiguration = null, IDictionary<string, Expression> customExpressions = null) {
       var program = RandomProgram(maxPoints, random, pushGpConfiguration, customExpressions);
 
@@ -31 +31 @@
     }
 
-    public static IEnumerable<Expression> RandomCode(int maxPoints, IRandom random = null, IReadonlyPushGpConfiguration pushGpConfiguration = null, IDictionary<string, Expression> customExpressions = null) {
+    public static IEnumerable<Expression> RandomCode(int maxPoints, IRandom random = null, IReadonlyPushConfiguration pushGpConfiguration = null, IDictionary<string, Expression> customExpressions = null) {
       if (maxPoints == 0)
         return new Expression[0];
 
       random = random ?? new FastRandom();
-      pushGpConfiguration = pushGpConfiguration ?? new PushGpConfiguration();
+      pushGpConfiguration = pushGpConfiguration ?? new PushConfiguration();
 
       if (pushGpConfiguration.EnabledExpressions.Count == 0)
@@ -46 +46 @@
     }
 
-    private static IEnumerable<Expression> RandomCodeWithSize(int points, IRandom random, IReadonlyPushGpConfiguration pushGpConfiguration, IDictionary<string, Expression> customExpressions = null) {
+    private static IEnumerable<Expression> RandomCodeWithSize(int points, IRandom random, IReadonlyPushConfiguration pushGpConfiguration, IDictionary<string, Expression> customExpressions = null) {
       if (points == 1) {
 
@@ -70 +70 @@
     }
 
-    private static Expression CreateExpression(IRandom random, IReadonlyPushGpConfiguration pushGpConfiguration, IDictionary<string, Expression> customExpressions = null) {
+    private static Expression CreateExpression(IRandom random, IReadonlyPushConfiguration pushGpConfiguration, IDictionary<string, Expression> customExpressions = null) {
       var customCount = customExpressions == null ? 0 : customExpressions.Count - 1;
       var index = random.Next(0, pushGpConfiguration.EnabledExpressions.Count + customCount - 1);
@@ -85 +85 @@
     }
 
-    private static Expression CreateRandomErcExpression(IRandom random, IReadonlyPushGpConfiguration pushGpConfiguration) {
+    private static Expression CreateRandomErcExpression(IRandom random, IReadonlyPushConfiguration pushGpConfiguration) {
       var value = random.Next(0, 3);