Changeset 4667 for branches/CloningRefactoring/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/ThreeIndexMove.cs

Timestamp:

10/29/10 17:37:02 (13 years ago)

Author:

abeham

Message:

#922

• Refactored HeuristicLab.Encodings.PermutationEncoding

File:

• branches/CloningRefactoring/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/ThreeIndexMove.cs (modified) (2 diffs)

branches/CloningRefactoring/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/ThreeIndexMove.cs

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