Changeset 4681 for branches/CloningRefactoring/HeuristicLab.Problems.OneMax/3.3/OneMaxSolution.cs

Timestamp:

10/29/10 19:40:07 (13 years ago)

Author:

gkronber

Message:

Refactored cloning in HeuristicLab.Problems.OneMax. #922

File:

• branches/CloningRefactoring/HeuristicLab.Problems.OneMax/3.3/OneMaxSolution.cs (modified) (3 diffs)

branches/CloningRefactoring/HeuristicLab.Problems.OneMax/3.3/OneMaxSolution.cs

@@ -34 +34 @@
   [Item("OneMaxSolution", "Represents a OneMax solution.")]
   [StorableClass]
-  public class OneMaxSolution : Item {
+  public sealed class OneMaxSolution : Item {
     public override Image ItemImage {
       get { return HeuristicLab.Common.Resources.VS2008ImageLibrary.Image; }
@@ -67 +67 @@
     }
 
+    [StorableConstructor]
+    private OneMaxSolution(bool deserializing) : base(deserializing) { }
+    private OneMaxSolution(OneMaxSolution original, Cloner cloner)
+      : base(original, cloner) {
+      binaryVector = cloner.Clone(original.binaryVector);
+      quality = cloner.Clone(original.quality);
+      Initialize();
+    }
     public OneMaxSolution() : base() { }
     public OneMaxSolution(BinaryVector binaryVector, DoubleValue quality)
@@ -74 +82 @@
       Initialize();
     }
-    [StorableConstructor]
-    private OneMaxSolution(bool deserializing) : base(deserializing) { }
 
     [StorableHook(HookType.AfterDeserialization)]
+    private void AfterDeserialization() {
+      Initialize();
+    }
+
     private void Initialize() {
       if (binaryVector != null) RegisterBinaryVectorEvents();
       if (quality != null) RegisterQualityEvents();
-    }
-
-    public override IDeepCloneable Clone(Cloner cloner) {
-      OneMaxSolution clone = new OneMaxSolution();
-      cloner.RegisterClonedObject(this, clone);
-      clone.binaryVector = (BinaryVector)cloner.Clone(binaryVector);
-      clone.quality = (DoubleValue)cloner.Clone(quality);
-      clone.Initialize();
-      return clone;
     }