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

trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/TwoOpt/InversionMoveAbsoluteAttribute.cs

@@ -38 +38 @@
 
     [StorableConstructor]
-    private InversionMoveAbsoluteAttribute(bool deserializing)
-      : base() {
+    protected InversionMoveAbsoluteAttribute(bool deserializing) : base(deserializing) { }
+    protected InversionMoveAbsoluteAttribute(InversionMoveAbsoluteAttribute original, Cloner cloner)
+      : base(original, cloner) {
+      this.Index1 = original.Index1;
+      this.Number1 = original.Number1;
+      this.Index2 = original.Index2;
+      this.Number2 = original.Number2;
     }
-
-    public InversionMoveAbsoluteAttribute()
-      : this(-1, -1, -1, -1, -1) { }
-
+    public InversionMoveAbsoluteAttribute() : this(-1, -1, -1, -1, -1) { }
     public InversionMoveAbsoluteAttribute(int index1, int number1, int index2, int number2, double moveQuality)
       : base(moveQuality) {
@@ -54 +56 @@
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      InversionMoveAbsoluteAttribute clone = (InversionMoveAbsoluteAttribute)base.Clone(cloner);
-      clone.Index1 = Index1;
-      clone.Number1 = Number1;
-      clone.Index2 = Index2;
-      clone.Number2 = Number2;
-      return clone;
+      return new InversionMoveAbsoluteAttribute(this, cloner);
     }
   }