Changeset 15301 for trunk/sources/HeuristicLab.Algorithms.ParameterlessPopulationPyramid/3.3/EvaluationTracker.cs

Timestamp:

08/01/17 11:07:48 (7 years ago)

Author:

mkommend

Message:

#2815: Corrected cloning and serializing of P3 and associated classes.

File:

• trunk/sources/HeuristicLab.Algorithms.ParameterlessPopulationPyramid/3.3/EvaluationTracker.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.Algorithms.ParameterlessPopulationPyramid/3.3/EvaluationTracker.cs

@@ -27 +27 @@
 using HeuristicLab.Encodings.BinaryVectorEncoding;
 using HeuristicLab.Parameters;
+using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Problems.Binary;
 
@@ -33 +34 @@
   // B. W. Goldman and W. F. Punch, "Parameter-less Population Pyramid," GECCO, pp. 785–792, 2014
   // and the original source code in C++11 available from: https://github.com/brianwgoldman/Parameter-less_Population_Pyramid
+  [StorableClass]
   internal sealed class EvaluationTracker : BinaryProblem {
+    [Storable]
     private readonly BinaryProblem problem;
-
+    [Storable]
     private int maxEvaluations;
 
     #region Properties
+    [Storable]
     public double BestQuality {
       get;
       private set;
     }
-
+    [Storable]
     public int Evaluations {
       get;
       private set;
     }
-
+    [Storable]
     public int BestFoundOnEvaluation {
       get;
       private set;
     }
-
+    [Storable]
     public BinaryVector BestSolution {
       get;
@@ -59 +63 @@
     }
     #endregion
+
+
+    [StorableConstructor]
+    private EvaluationTracker(bool deserializing) : base(deserializing) { }
 
     private EvaluationTracker(EvaluationTracker original, Cloner cloner)
@@ -67 +75 @@
       Evaluations = original.Evaluations;
       BestFoundOnEvaluation = original.BestFoundOnEvaluation;
-      BestSolution = cloner.Clone(BestSolution);
+      BestSolution = cloner.Clone(original.BestSolution);
     }
     public override IDeepCloneable Clone(Cloner cloner) {
       return new EvaluationTracker(this, cloner);
     }
+
     public EvaluationTracker(BinaryProblem problem, int maxEvaluations) {
       this.problem = problem;