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

Timestamp:

05/10/17 11:23:05 (7 years ago)

Author:

pkimmesw

Message:

#2665 Added IsNoop to Expression, Made Expressions storable, Fixed Debugger, Fixed and improved problem data and result visualisation, Added custom ErcOption view, Added problem difficulty to problem data name

File:

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

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

@@ -17 +17 @@
     [Storable]
     public readonly IReadOnlyPushConfiguration Config;
-
     [Storable]
     public readonly IPushEvaluator Evaluator;
+    [Storable]
+    protected readonly bool simplify;
 
-    public readonly PushProgram Program;
+    public PushProgram Program;
+
 
     public PushSolution(IntegerVector integerVector, double quality, IRandom random, IReadOnlyPushConfiguration config, IPushEvaluator evaluator, bool simplify = false)
@@ -30 +32 @@
       Config = config;
       Evaluator = evaluator;
+      this.simplify = simplify;
 
-      Program = IntegerVector.ToPushProgram(config);
+      InitProgram();
+    }
+
+    private void InitProgram() {
+      Program = IntegerVector.ToPushProgram(Config);
 
       if (simplify)
-        Program = Simplifier.Simplifier.Simplify(Program, p => Evaluator.EvaluateTraining(config, p, random).TotalQuality);
+        Program = Simplifier.Simplifier.Simplify(Program, Config, p => Evaluator.EvaluateTraining(Config, p, Random).TotalQuality);
     }
 
     public PushSolution(PushSolution origin, Cloner cloner) : base(origin, cloner) {
+      IntegerVector = cloner.Clone(origin.IntegerVector);
       Quality = origin.Quality;
-      IntegerVector = cloner.Clone(origin.IntegerVector);
       Random = cloner.Clone(origin.Random);
       Config = cloner.Clone(origin.Config);
+      Evaluator = cloner.Clone(origin.Evaluator);
+      Program = origin.Program; // push programs are immutable like all expressions
+      simplify = origin.simplify;
     }
 
@@ -51 +61 @@
     protected PushSolution(bool deserializing) : base(deserializing) { }
 
+    [StorableHook(HookType.AfterDeserialization)]
+    // ReSharper disable once UnusedMember.Local
+    private void AfterDeserialization() {
+      InitProgram();
+    }
+
     public override IDeepCloneable Clone(Cloner cloner) {
       return new PushSolution(this, cloner);