Changeset 15289 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Problem/PlushPushProblem.cs

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/Problem/PlushPushProblem.cs (modified) (3 diffs)

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Problem/PlushPushProblem.cs

@@ -9 +9 @@
   using HeuristicLab.Problems.ProgramSynthesis.Push.Analyzer;
   using HeuristicLab.Problems.ProgramSynthesis.Push.Encoding;
+  using HeuristicLab.Problems.ProgramSynthesis.Push.Evaluator;
   using HeuristicLab.Problems.ProgramSynthesis.Push.Expressions;
 
@@ -43 +44 @@
     }
 
-    protected override PushProgram MapIndividual(Individual individual, IRandom random) {
+    protected override PushProgram MapIndividual(Individual individual) {
       var plushVector = individual.PlushVector();
       var program = plushVector.PushProgram;
@@ -49 +50 @@
       return program;
     }
-
-    public override double Evaluate(Individual individual, IRandom random) {
-      var program = MapIndividual(individual, random);
-      var result = PushEvaluator.EvaluateTraining(Pool, program, random);
-
-      individual[CaseQualitiesScopeParameterName] = new DoubleArray(result.ExampleQualities);
-
-      return result.AvgQuality;
-    }
   }
 }