Changeset 4722 for trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/SingleObjectiveTestFunctionSolution.cs

Timestamp:

11/06/10 01:56:04 (13 years ago)

Author:

swagner

Message:

Merged cloning refactoring branch back into trunk (#922)

Location:

trunk/sources

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.TestFunctions/3.3/SingleObjectiveTestFunctionSolution.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/SingleObjectiveTestFunctionSolution.cs

@@ -122 +122 @@
     }
 
+    [StorableConstructor]
+    protected SingleObjectiveTestFunctionSolution(bool deserializing) : base(deserializing) { }
+    protected SingleObjectiveTestFunctionSolution(SingleObjectiveTestFunctionSolution original, Cloner cloner)
+      : base(original, cloner) {
+      bestKnownRealVector = cloner.Clone(original.bestKnownRealVector);
+      bestRealVector = cloner.Clone(original.bestRealVector);
+      bestQuality = cloner.Clone(original.bestQuality);
+      population = cloner.Clone(original.population);
+      evaluator = cloner.Clone(original.evaluator);
+      bounds = cloner.Clone(original.bounds);
+      Initialize();
+    }
     public SingleObjectiveTestFunctionSolution() : base() { }
     public SingleObjectiveTestFunctionSolution(RealVector realVector, DoubleValue quality, ISingleObjectiveTestFunctionProblemEvaluator evaluator)
@@ -130 +142 @@
       Initialize();
     }
-    [StorableConstructor]
-    private SingleObjectiveTestFunctionSolution(bool deserializing) : base(deserializing) { }
 
     [StorableHook(HookType.AfterDeserialization)]
+    private void AfterDeserialization() {
+      Initialize();
+    }
+
     private void Initialize() {
       if (bestKnownRealVector != null) RegisterBestKnownRealVectorEvents();
@@ -143 +157 @@
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      SingleObjectiveTestFunctionSolution clone = new SingleObjectiveTestFunctionSolution();
-      cloner.RegisterClonedObject(this, clone);
-      clone.bestKnownRealVector = (RealVector)cloner.Clone(bestKnownRealVector);
-      clone.bestRealVector = (RealVector)cloner.Clone(bestRealVector);
-      clone.bestQuality = (DoubleValue)cloner.Clone(bestQuality);
-      clone.population = (ItemArray<RealVector>)cloner.Clone(population);
-      clone.evaluator = (ISingleObjectiveTestFunctionProblemEvaluator)cloner.Clone(evaluator);
-      clone.bounds = (DoubleMatrix)cloner.Clone(bounds);
-      clone.Initialize();
-      return clone;
+      return new SingleObjectiveTestFunctionSolution(this, cloner);
     }