Changeset 4722 for trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/TwoIndexMove.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.Encodings.PermutationEncoding/3.3/Moves/TwoIndexMove.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/TwoIndexMove.cs

@@ -35 +35 @@
     public Permutation Permutation { get; protected set; }
 
-    public TwoIndexMove()
-      : base() {
-      Index1 = -1;
-      Index2 = -1;
-      Permutation = null;
+    [StorableConstructor]
+    protected TwoIndexMove(bool deserializing) : base(deserializing) { }
+    protected TwoIndexMove(TwoIndexMove original, Cloner cloner)
+      : base(original, cloner) {
+      this.Index1 = original.Index1;
+      this.Index2 = original.Index2;
+      if (original.Permutation != null)
+        this.Permutation = cloner.Clone(original.Permutation);
     }
-
+    public TwoIndexMove() : this(-1, -1, null) { }
     public TwoIndexMove(int index1, int index2, Permutation permutation)
       : base() {
@@ -50 +53 @@
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      TwoIndexMove clone = (TwoIndexMove)base.Clone(cloner);
-      clone.Index1 = Index1;
-      clone.Index2 = Index2;
-      if (Permutation != null)
-        clone.Permutation = (Permutation)Permutation.Clone(cloner);
-      return clone;
+      return new TwoIndexMove(this, cloner);
     }
   }