Changeset 15289 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Individual

Timestamp:

07/26/17 19:34:13 (7 years ago)

Author:

pkimmesw

Message:

#2665 Fixed analyzer, fixed Plush encoding + operators, adpated print evaluation according to McPhee

Location:

branches/PushGP/HeuristicLab.PushGP

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.ProgramSynthesis/Push/Individual/IndividualExtensions.cs (modified) (2 diffs)

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Individual/IndividualExtensions.cs

@@ -1 +1 @@
 namespace HeuristicLab.Problems.ProgramSynthesis.Push.Individual {
   using System.Collections.Generic;
-
-  using HeuristicLab.Core;
   using HeuristicLab.Encodings.IntegerVectorEncoding;
   using HeuristicLab.Optimization;
   using HeuristicLab.Problems.ProgramSynthesis.Push.Configuration;
   using HeuristicLab.Problems.ProgramSynthesis.Push.Expressions;
-  using HeuristicLab.Problems.ProgramSynthesis.Push.Generators.CodeGenerator;
   using HeuristicLab.Problems.ProgramSynthesis.Push.SolutionCreator;
 
   public static class IndividualExtensions {
 
-    public static PushProgram ToPushProgram(this Individual individual, IReadOnlyPushConfiguration config, IRandom random) {
-      return individual.IntegerVector().ToPushProgram(config, random);
+    public static PushProgram ToPushProgram(this Individual individual, IReadOnlyPushConfiguration config) {
+      return individual.IntegerVector().ToPushProgram(config);
     }
 
-    public static PushProgram ToPushProgram(this IntegerVector vector, IReadOnlyPushConfiguration config, IRandom random) {
+    public static PushProgram ToPushProgram(this IntegerVector vector, IReadOnlyPushConfiguration config) {
       //var currentIndex = 0;
       //var close = 0;
@@ -24 +21 @@
         var index = vector[i];
 
-        if (index == PushSolutionEncoding.End)
-          break;
+        if (index == PushSolutionEncoding.End) break;
+        if (index == PushSolutionEncoding.Noop) continue;
 
-        // skip noops
-        if (index == PushSolutionEncoding.Noop)
-          continue;
+        var name = config.EnabledExpressions[index];
+        var expression = ExpressionTable.GetExpression(name);
 
-        var expression = CodeGeneratorUtils.MapToExpression(
-          index,
-          random,
-          config.ErcOptions,
-          config);
+        //var expression = CodeGeneratorUtils.MapToExpression(
+        //  index,
+        //  random,
+        //  config.ErcOptions,
+        //  config);
 
         expressions.Add(expression);