Changeset 14897 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Problem/PushSolution.cs

Timestamp:

04/28/17 22:52:08 (7 years ago)

Author:

pkimmesw

Message:

#2665 Dynamic ErcValues, Separate Push from BenchmarkSuite Push

File:

• branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Problem/PushSolution.cs (modified) (2 diffs)

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

@@ -1 +1 @@
 namespace HeuristicLab.Problems.ProgramSynthesis.Push.Problem {
-  using HeuristicLab.BenchmarkSuite.Problems;
-  using HeuristicLab.Common;
-  using HeuristicLab.Core;
-  using HeuristicLab.Encodings.IntegerVectorEncoding;
-  using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-  using HeuristicLab.Problems.ProgramSynthesis.Push.Configuration;
+  using Common;
+  using Configuration;
+  using Core;
+  using Encodings.IntegerVectorEncoding;
+  using Expressions;
+  using Persistence.Default.CompositeSerializers.Storable;
 
   [StorableClass]
@@ -14 +14 @@
     public readonly IntegerVector IntegerVector;
     [Storable]
-    public readonly ProblemData Data;
-    [Storable]
     public readonly IRandom Random;
     [Storable]
     public readonly IReadOnlyPushConfiguration Config;
+
     [Storable]
-    public readonly int DataStart;
-    [Storable]
-    public readonly int DataEnd;
-    [Storable]
-    public readonly bool Simplify;
+    public readonly IPushEvaluator Evaluator;
 
-    public PushSolution(IntegerVector integerVector, double quality, ProblemData data, IRandom random, IReadOnlyPushConfiguration config, int dataStart, int dataEnd, bool simplify = false)
+    public readonly PushProgram Program;
+
+    public PushSolution(IntegerVector integerVector, double quality, IRandom random, IReadOnlyPushConfiguration config, IPushEvaluator evaluator, bool simplify = false)
       : base("Solution", "A push solution.") {
       IntegerVector = integerVector;
       Quality = quality;
-      Data = data;
       Random = random;
       Config = config;
-      DataStart = dataStart;
-      DataEnd = dataEnd;
-      Simplify = simplify;
+      Evaluator = evaluator;
+
+      Program = IntegerVector.ToPushProgram(config);
+
+      if (simplify)
+        Program = Simplifier.Simplifier.Simplify(Program, p => Evaluator.EvaluateTraining(config, p, random).TotalQuality);
     }
 
     public PushSolution(PushSolution origin, Cloner cloner) : base(origin, cloner) {
+      Quality = origin.Quality;
       IntegerVector = cloner.Clone(origin.IntegerVector);
-      Quality = origin.Quality;
-      Data = cloner.Clone(origin.Data);
       Random = cloner.Clone(origin.Random);
       Config = cloner.Clone(origin.Config);
-      DataStart = origin.DataStart;
-      DataEnd = origin.DataEnd;
-      Simplify = origin.Simplify;
+    }
+
+    public virtual PushSolution Simplify() {
+      return new PushSolution(IntegerVector, Quality, Random, Config, Evaluator, true);
     }
 
     [StorableConstructor]
-    private PushSolution(bool deserializing) : base(deserializing) { }
+    protected PushSolution(bool deserializing) : base(deserializing) { }
 
     public override IDeepCloneable Clone(Cloner cloner) {