Changeset 15273 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Generators/CodeGenerator/LinearCodeGenerator.cs

Timestamp:

07/19/17 12:55:58 (7 years ago)

Author:

pkimmesw

Message:

#2665 Started Plush Encoding, Added Zero Error Individual Count Analyzer

File:

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

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

@@ -31 +31 @@
       IManagedPool<PooledList<Expression>> expressionListPool = null,
       IRandom random = null,
-      IReadOnlyPushConfiguration pushConfiguration = null,
+      IReadOnlyPushConfiguration config = null,
       IDictionary<string, Expression> customExpressions = null) {
       if (maxPoints == 0)
         return new Expression[0];
 
-      random = random ?? new FastRandom();
-      pushConfiguration = pushConfiguration ?? new PushConfiguration();
+      random = random ?? new MersenneTwister();
+      config = config ?? new PushConfiguration();
 
       var size = maxPoints <= 1 ? 1 : random.Next(1, maxPoints);
@@ -43 +43 @@
 
       for (var i = 0; i < size; i++) {
-        var expression = CodeGeneratorUtils.CreateExpressionOrErc(
+        var expression = CodeGeneratorUtils.MapToExpression(
           random,
-          pushConfiguration.EnabledExpressions,
-          pushConfiguration.ErcOptions,
+          config.ErcOptions,
+          config,
           customExpressions);