Changeset 4722 for trunk/sources/HeuristicLab.Problems.Knapsack/3.3/KnapsackSolution.cs

Timestamp:

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

Author:

swagner

Message:

Merged cloning refactoring branch back into trunk (#922)

Location:

trunk/sources

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.Knapsack/3.3/KnapsackSolution.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Problems.Knapsack/3.3/KnapsackSolution.cs

@@ -109 +109 @@
     }
 
+    [StorableConstructor]
+    protected KnapsackSolution(bool deserializing) : base(deserializing) { }
+    protected KnapsackSolution(KnapsackSolution original, Cloner cloner)
+      : base(original, cloner) {
+      this.binaryVector = cloner.Clone(original.binaryVector);
+      this.quality = cloner.Clone(original.quality);
+      this.capacity = cloner.Clone(original.capacity);
+      this.weights = cloner.Clone(original.weights);
+      this.values = cloner.Clone(original.values);
+      Initialize();
+    }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new KnapsackSolution(this, cloner);
+    }
     public KnapsackSolution() : base() { }
     public KnapsackSolution(BinaryVector binaryVector, DoubleValue quality, IntValue capacity, IntArray weights, IntArray values)
@@ -119 +133 @@
       Initialize();
     }
-    [StorableConstructor]
-    private KnapsackSolution(bool deserializing) : base(deserializing) { }
 
     [StorableHook(HookType.AfterDeserialization)]
+    private void AfterDeserialization() {
+      Initialize();
+    }
+
     private void Initialize() {
       if (binaryVector != null) RegisterBinaryVectorEvents();
@@ -131 +147 @@
     }
 
-    public override IDeepCloneable Clone(Cloner cloner) {
-      KnapsackSolution clone = new KnapsackSolution();
-      cloner.RegisterClonedObject(this, clone);
-      clone.binaryVector = (BinaryVector)cloner.Clone(binaryVector);
-      clone.quality = (DoubleValue)cloner.Clone(quality);
-      clone.capacity = (IntValue)cloner.Clone(capacity);
-      clone.weights = (IntArray)cloner.Clone(weights);
-      clone.values = (IntArray)cloner.Clone(values);
-      clone.Initialize();
-      return clone;
-    }
-
     #region Events
     public event EventHandler BinaryVectorChanged;