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

Timestamp:

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

Author:

abeham

Message:

#922

• Refactored HeuristicLab.Encodings.PermutationEncoding

Location:

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

Files:

• PermutationMoveAttribute.cs (modified) (2 diffs)
• ThreeIndexMove.cs (modified) (2 diffs)
• ThreeOpt/ExhaustiveInsertionMoveGenerator.cs (modified) (2 diffs)
• ThreeOpt/StochasticSingleInsertionMoveGenerator.cs (modified) (2 diffs)
• ThreeOpt/StochasticTranslocationMultiMoveGenerator.cs (modified) (2 diffs)
• ThreeOpt/StochasticTranslocationSingleMoveGenerator.cs (modified) (2 diffs)
• ThreeOpt/TranslocationMove.cs (modified) (2 diffs)
• ThreeOpt/TranslocationMoveAbsoluteAttribute.cs (modified) (2 diffs)
• ThreeOpt/TranslocationMoveGenerator.cs (modified) (2 diffs)
• ThreeOpt/TranslocationMoveHardTabuCriterion.cs (modified) (3 diffs)
• ThreeOpt/TranslocationMoveMaker.cs (modified) (3 diffs)
• ThreeOpt/TranslocationMoveRelativeAttribute.cs (modified) (2 diffs)
• ThreeOpt/TranslocationMoveSoftTabuCriterion.cs (modified) (3 diffs)
• ThreeOpt/TranslocationMoveTabuMaker.cs (modified) (2 diffs)
• TwoIndexMove.cs (modified) (2 diffs)
• TwoOpt/ExhaustiveInversionMoveGenerator.cs (modified) (2 diffs)
• TwoOpt/InversionMove.cs (modified) (2 diffs)
• TwoOpt/InversionMoveAbsoluteAttribute.cs (modified) (2 diffs)
• TwoOpt/InversionMoveGenerator.cs (modified) (2 diffs)
• TwoOpt/InversionMoveHardTabuCriterion.cs (modified) (3 diffs)
• TwoOpt/InversionMoveMaker.cs (modified) (3 diffs)
• TwoOpt/InversionMoveRelativeAttribute.cs (modified) (2 diffs)
• TwoOpt/InversionMoveSoftTabuCriterion.cs (modified) (3 diffs)
• TwoOpt/InversionMoveTabuMaker.cs (modified) (2 diffs)
• TwoOpt/StochasticInversionMultiMoveGenerator.cs (modified) (2 diffs)
• TwoOpt/StochasticInversionSingleMoveGenerator.cs (modified) (2 diffs)

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

@@ -31 +31 @@
     public double MoveQuality { get; protected set; }
 
-    public PermutationMoveAttribute()
-      : base() {
-      MoveQuality = 0;
+    [StorableConstructor]
+    protected PermutationMoveAttribute(bool deserializing) : base(deserializing) { }
+    protected PermutationMoveAttribute(PermutationMoveAttribute original, Cloner cloner)
+      : base(original, cloner) {
+      this.MoveQuality = original.MoveQuality;
     }
-
+    public PermutationMoveAttribute() : this(0) { }
     public PermutationMoveAttribute(double moveQuality)
       : base() {
@@ -42 +44 @@
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      PermutationMoveAttribute clone = (PermutationMoveAttribute)base.Clone(cloner);
-      clone.MoveQuality = MoveQuality;
-      return clone;
+      return new PermutationMoveAttribute(this, cloner);
     }
   }

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);
     }
   }

branches/CloningRefactoring/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/ThreeOpt/ExhaustiveInsertionMoveGenerator.cs

@@ -24 +24 @@
 using HeuristicLab.Optimization;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.Encodings.PermutationEncoding {
@@ -29 +30 @@
   [StorableClass]
   public class ExhaustiveInsertionMoveGenerator : TranslocationMoveGenerator, IExhaustiveMoveGenerator {
+    [StorableConstructor]
+    protected ExhaustiveInsertionMoveGenerator(bool deserializing) : base(deserializing) { }
+    protected ExhaustiveInsertionMoveGenerator(ExhaustiveInsertionMoveGenerator original, Cloner cloner) : base(original, cloner) { }
+    public ExhaustiveInsertionMoveGenerator() : base() { }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new ExhaustiveInsertionMoveGenerator(this, cloner);
+    }
+
     public static TranslocationMove[] Apply(Permutation permutation) {
       int length = permutation.Length;

branches/CloningRefactoring/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/ThreeOpt/StochasticSingleInsertionMoveGenerator.cs

@@ -27 +27 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.Encodings.PermutationEncoding {
@@ -44 +45 @@
     }
 
-    public StochasticInsertionMultiMoveGenerator() {
+    [StorableConstructor]
+    protected StochasticInsertionMultiMoveGenerator(bool deserializing) : base(deserializing) { }
+    protected StochasticInsertionMultiMoveGenerator(StochasticInsertionMultiMoveGenerator original, Cloner cloner) : base(original, cloner) { }
+    public StochasticInsertionMultiMoveGenerator() : base() {
       Parameters.Add(new LookupParameter<IRandom>("Random", "The random number generator to use."));
       Parameters.Add(new ValueLookupParameter<IntValue>("SampleSize", "The number of moves to generate."));
+    }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new StochasticInsertionMultiMoveGenerator(this, cloner);
     }
 

branches/CloningRefactoring/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/ThreeOpt/StochasticTranslocationMultiMoveGenerator.cs

@@ -25 +25 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.Encodings.PermutationEncoding {
@@ -42 +43 @@
     }
 
-    public StochasticTranslocationMultiMoveGenerator()
-      : base() {
+    [StorableConstructor]
+    protected StochasticTranslocationMultiMoveGenerator(bool deserializing) : base(deserializing) { }
+    protected StochasticTranslocationMultiMoveGenerator(StochasticTranslocationMultiMoveGenerator original, Cloner cloner) : base(original, cloner) { }
+    public StochasticTranslocationMultiMoveGenerator() : base() {
       Parameters.Add(new LookupParameter<IRandom>("Random", "The random number generator."));
       Parameters.Add(new ValueLookupParameter<IntValue>("SampleSize", "The number of moves to generate."));
+    }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new StochasticTranslocationMultiMoveGenerator(this, cloner);
     }
 

branches/CloningRefactoring/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/ThreeOpt/StochasticTranslocationSingleMoveGenerator.cs

@@ -25 +25 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.Encodings.PermutationEncoding {
@@ -34 +35 @@
     }
 
+    [StorableConstructor]
+    protected StochasticTranslocationSingleMoveGenerator(bool deserializing) : base(deserializing) { }
+    protected StochasticTranslocationSingleMoveGenerator(StochasticTranslocationSingleMoveGenerator original, Cloner cloner) : base(original, cloner) { }
     public StochasticTranslocationSingleMoveGenerator()
       : base() {
       Parameters.Add(new LookupParameter<IRandom>("Random", "The random number generator."));
+    }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new StochasticTranslocationSingleMoveGenerator(this, cloner);
     }
 

branches/CloningRefactoring/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/ThreeOpt/TranslocationMove.cs

@@ -22 +22 @@
 using HeuristicLab.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.Encodings.PermutationEncoding {
@@ -27 +28 @@
   [StorableClass]
   public class TranslocationMove : ThreeIndexMove {
-    public TranslocationMove()
-      : base() {
-    }
+    [StorableConstructor]
+    protected TranslocationMove(bool deserializing) : base(deserializing) { }
+    protected TranslocationMove(TranslocationMove original, Cloner cloner) : base(original, cloner) { }
+    public TranslocationMove() : base() { }
+    public TranslocationMove(int index1, int index2, int index3) : base(index1, index2, index3, null) { }
+    public TranslocationMove(int index1, int index2, int index3, Permutation permutation) : base(index1, index2, index3, permutation) { }
 
-    public TranslocationMove(int index1, int index2, int index3)
-      : base(index1, index2, index3, null) {
-    }
-
-    public TranslocationMove(int index1, int index2, int index3, Permutation permutation)
-      : base(index1, index2, index3, permutation) {
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new TranslocationMove(this, cloner);
     }
   }

branches/CloningRefactoring/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/ThreeOpt/TranslocationMoveAbsoluteAttribute.cs

@@ -36 +36 @@
 
     [StorableConstructor]
-    private TranslocationMoveAbsoluteAttribute(bool deserializing)
-      : base() {
+    protected TranslocationMoveAbsoluteAttribute(bool deserializing) : base(deserializing) { }
+    protected TranslocationMoveAbsoluteAttribute(TranslocationMoveAbsoluteAttribute original, Cloner cloner)
+      : base(original, cloner) {
+      this.Number = (int[])original.Number.Clone();
+      this.OldPosition = original.OldPosition;
+      this.NewPosition = original.NewPosition;
     }
-
-    public TranslocationMoveAbsoluteAttribute()
-      : this(null, -1, -1, -1) { }
-
+    public TranslocationMoveAbsoluteAttribute() : this(null, -1, -1, -1) { }
     public TranslocationMoveAbsoluteAttribute(int[] number, int oldPosition, int newPosition, double moveQuality)
       : base(moveQuality) {
@@ -51 +52 @@
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      TranslocationMoveAbsoluteAttribute clone = (TranslocationMoveAbsoluteAttribute)base.Clone(cloner);
-      clone.Number = Number;
-      clone.OldPosition = OldPosition;
-      clone.NewPosition = NewPosition;
-      return clone;
+      return new TranslocationMoveAbsoluteAttribute(this, cloner);
     }
   }

branches/CloningRefactoring/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/ThreeOpt/TranslocationMoveGenerator.cs

@@ -25 +25 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.Encodings.PermutationEncoding {
@@ -43 +44 @@
     }
 
+    [StorableConstructor]
+    protected TranslocationMoveGenerator(bool deserializing) : base(deserializing) { }
+    protected TranslocationMoveGenerator(TranslocationMoveGenerator original, Cloner cloner) : base(original, cloner) { }
     public TranslocationMoveGenerator()
       : base() {

branches/CloningRefactoring/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/ThreeOpt/TranslocationMoveHardTabuCriterion.cs

@@ -26 +26 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.Encodings.PermutationEncoding {
@@ -64 +65 @@
     }
 
+    [StorableConstructor]
+    protected TranslocationMoveHardTabuCriterion(bool deserializing) : base(deserializing) { }
+    protected TranslocationMoveHardTabuCriterion(TranslocationMoveHardTabuCriterion original, Cloner cloner) : base(original, cloner) { }
     public TranslocationMoveHardTabuCriterion()
       : base() {
@@ -73 +77 @@
       Parameters.Add(new ValueLookupParameter<BoolValue>("Maximization", "True if the problem is a maximization problem, else if it is a minimization problem."));
       Parameters.Add(new LookupParameter<DoubleValue>("MoveQuality", "The quality of the current move."));
+    }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new TranslocationMoveHardTabuCriterion(this, cloner);
     }
 

branches/CloningRefactoring/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/ThreeOpt/TranslocationMoveMaker.cs

@@ -26 +26 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.Encodings.PermutationEncoding {
@@ -47 +48 @@
     }
 
+    [StorableConstructor]
+    protected TranslocationMoveMaker(bool deserializing) : base(deserializing) { }
+    protected TranslocationMoveMaker(TranslocationMoveMaker original, Cloner cloner) : base(original, cloner) { }
     public TranslocationMoveMaker()
       : base() {
@@ -53 +57 @@
       Parameters.Add(new LookupParameter<DoubleValue>("MoveQuality", "The relative quality of the move."));
       Parameters.Add(new LookupParameter<Permutation>("Permutation", "The solution as permutation."));
+    }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new TranslocationMoveMaker(this, cloner);
     }
 

branches/CloningRefactoring/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/ThreeOpt/TranslocationMoveRelativeAttribute.cs

@@ -42 +42 @@
 
     [StorableConstructor]
-    private TranslocationMoveRelativeAttribute(bool deserializing)
-      : base() {
+    protected TranslocationMoveRelativeAttribute(bool deserializing) : base(deserializing) { }
+    protected TranslocationMoveRelativeAttribute(TranslocationMoveRelativeAttribute original, Cloner cloner)
+      : base(original, cloner) {
+      this.Edge1Source = original.Edge1Source;
+      this.Edge1Target = original.Edge1Target;
+      this.Edge2Source = original.Edge2Source;
+      this.Edge2Target = original.Edge2Target;
+      this.Edge3Source = original.Edge3Source;
+      this.Edge3Target = original.Edge3Target;
     }
-
-    public TranslocationMoveRelativeAttribute()
-      : this(-1, -1, -1, -1, -1, -1, -1) { }
-
+    public TranslocationMoveRelativeAttribute() : this(-1, -1, -1, -1, -1, -1, -1) { }
     public TranslocationMoveRelativeAttribute(int edge1Source, int edge1Target, int edge2Source, int edge2Target, int edge3Source, int edge3Target, double moveQuality)
       : base(moveQuality) {
@@ -60 +64 @@
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      TranslocationMoveRelativeAttribute clone = (TranslocationMoveRelativeAttribute)base.Clone(cloner);
-      clone.Edge1Source = Edge1Source;
-      clone.Edge1Target = Edge1Target;
-      clone.Edge2Source = Edge2Source;
-      clone.Edge2Target = Edge2Target;
-      clone.Edge3Source = Edge3Source;
-      clone.Edge3Target = Edge3Target;
-      return clone;
+      return new TranslocationMoveRelativeAttribute(this, cloner);
     }
   }

branches/CloningRefactoring/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/ThreeOpt/TranslocationMoveSoftTabuCriterion.cs

@@ -26 +26 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.Encodings.PermutationEncoding {
@@ -64 +65 @@
     }
 
+    [StorableConstructor]
+    protected TranslocationMoveSoftTabuCriterion(bool deserializing) : base(deserializing) { }
+    protected TranslocationMoveSoftTabuCriterion(TranslocationMoveSoftTabuCriterion original, Cloner cloner) : base(original, cloner) { }
     public TranslocationMoveSoftTabuCriterion()
       : base() {
@@ -73 +77 @@
       Parameters.Add(new ValueLookupParameter<BoolValue>("Maximization", "True if the problem is a maximization problem, else if it is a minimization problem."));
       Parameters.Add(new LookupParameter<DoubleValue>("MoveQuality", "The quality of the current move."));
+    }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new TranslocationMoveSoftTabuCriterion(this, cloner);
     }
 

branches/CloningRefactoring/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/ThreeOpt/TranslocationMoveTabuMaker.cs

@@ -24 +24 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.Encodings.PermutationEncoding {
@@ -36 +37 @@
     }
 
+    [StorableConstructor]
+    protected TranslocationMoveTabuMaker(bool deserializing) : base(deserializing) { }
+    protected TranslocationMoveTabuMaker(TranslocationMoveTabuMaker original, Cloner cloner) : base(original, cloner) { }
     public TranslocationMoveTabuMaker()
       : base() {
       Parameters.Add(new LookupParameter<TranslocationMove>("TranslocationMove", "The move that was made."));
       Parameters.Add(new LookupParameter<Permutation>("Permutation", "The solution as permutation."));
+    }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new TranslocationMoveTabuMaker(this, cloner);
     }
 

branches/CloningRefactoring/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);
     }
   }

branches/CloningRefactoring/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/TwoOpt/ExhaustiveInversionMoveGenerator.cs

@@ -24 +24 @@
 using HeuristicLab.Optimization;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.Encodings.PermutationEncoding {
@@ -29 +30 @@
   [StorableClass]
   public class ExhaustiveInversionMoveGenerator : InversionMoveGenerator, IExhaustiveMoveGenerator {
+    [StorableConstructor]
+    protected ExhaustiveInversionMoveGenerator(bool deserializing) : base(deserializing) { }
+    protected ExhaustiveInversionMoveGenerator(ExhaustiveInversionMoveGenerator original, Cloner cloner) : base(original, cloner) { }
+    public ExhaustiveInversionMoveGenerator() : base() { }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new ExhaustiveInversionMoveGenerator(this, cloner);
+    }
+
     public static InversionMove[] Apply(Permutation permutation) {
       int length = permutation.Length;

branches/CloningRefactoring/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/TwoOpt/InversionMove.cs

@@ -22 +22 @@
 using HeuristicLab.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.Encodings.PermutationEncoding {
@@ -27 +28 @@
   [StorableClass]
   public class InversionMove : TwoIndexMove {
-    public InversionMove()
-      : base() {
-    }
+    [StorableConstructor]
+    protected InversionMove(bool deserializing) : base(deserializing) { }
+    protected InversionMove(InversionMove original, Cloner cloner) : base(original, cloner) { }
+    public InversionMove() : base() { }
+    public InversionMove(int index1, int index2) : base(index1, index2, null) { }
+    public InversionMove(int index1, int index2, Permutation permutation) : base(index1, index2, permutation) { }
 
-    public InversionMove(int index1, int index2)
-      : base(index1, index2, null) {
-    }
-
-    public InversionMove(int index1, int index2, Permutation permutation)
-      : base(index1, index2, permutation) {
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new InversionMove(this, cloner);
     }
   }

branches/CloningRefactoring/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);
     }
   }

branches/CloningRefactoring/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/TwoOpt/InversionMoveGenerator.cs

@@ -25 +25 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.Encodings.PermutationEncoding {
@@ -43 +44 @@
     }
 
+    [StorableConstructor]
+    protected InversionMoveGenerator(bool deserializing) : base(deserializing) { }
+    protected InversionMoveGenerator(InversionMoveGenerator original, Cloner cloner) : base(original, cloner) { }
     public InversionMoveGenerator()
       : base() {

branches/CloningRefactoring/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/TwoOpt/InversionMoveHardTabuCriterion.cs

@@ -27 +27 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.Encodings.PermutationEncoding {
@@ -65 +66 @@
     }
 
+    [StorableConstructor]
+    protected InversionMoveHardTabuCriterion(bool deserializing) : base(deserializing) { }
+    protected InversionMoveHardTabuCriterion(InversionMoveHardTabuCriterion original, Cloner cloner) : base(original, cloner) { }
     public InversionMoveHardTabuCriterion()
       : base() {
@@ -74 +78 @@
       Parameters.Add(new ValueLookupParameter<BoolValue>("Maximization", "True if the problem is a maximization problem, else if it is a minimization problem."));
       Parameters.Add(new LookupParameter<DoubleValue>("MoveQuality", "The quality of the current move."));
+    }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new InversionMoveHardTabuCriterion(this, cloner);
     }
 

branches/CloningRefactoring/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/TwoOpt/InversionMoveMaker.cs

@@ -26 +26 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.Encodings.PermutationEncoding {
@@ -47 +48 @@
     }
 
+    [StorableConstructor]
+    protected InversionMoveMaker(bool deserializing) : base(deserializing) { }
+    protected InversionMoveMaker(InversionMoveMaker original, Cloner cloner) : base(original, cloner) { }
     public InversionMoveMaker()
       : base() {
@@ -53 +57 @@
       Parameters.Add(new LookupParameter<DoubleValue>("MoveQuality", "The relative quality of the move."));
       Parameters.Add(new LookupParameter<Permutation>("Permutation", "The solution as permutation."));
+    }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new InversionMoveMaker(this, cloner);
     }
 

branches/CloningRefactoring/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/TwoOpt/InversionMoveRelativeAttribute.cs

@@ -38 +38 @@
 
     [StorableConstructor]
-    private InversionMoveRelativeAttribute(bool deserializing)
-      : base() {
+    protected InversionMoveRelativeAttribute(bool deserializing) : base(deserializing) { }
+    protected InversionMoveRelativeAttribute(InversionMoveRelativeAttribute original, Cloner cloner)
+      : base(original, cloner) {
+      this.Edge1Source = original.Edge1Source;
+      this.Edge1Target = original.Edge1Target;
+      this.Edge2Source = original.Edge2Source;
+      this.Edge2Target = original.Edge2Target;
     }
-
-    public InversionMoveRelativeAttribute()
-      : this(-1, -1, -1, -1, -1) { }
-
+    public InversionMoveRelativeAttribute() : this(-1, -1, -1, -1, -1) { }
     public InversionMoveRelativeAttribute(int edge1Source, int edge1Target, int edge2Source, int edge2Target, double moveQuality)
       : base(moveQuality) {
@@ -54 +56 @@
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      InversionMoveRelativeAttribute clone = (InversionMoveRelativeAttribute)base.Clone(cloner);
-      clone.Edge1Source = Edge1Source;
-      clone.Edge1Target = Edge1Target;
-      clone.Edge2Source = Edge2Source;
-      clone.Edge2Target = Edge2Target;
-      return clone;
+      return new InversionMoveRelativeAttribute(this, cloner);
     }
   }

branches/CloningRefactoring/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/TwoOpt/InversionMoveSoftTabuCriterion.cs

@@ -27 +27 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.Encodings.PermutationEncoding {
@@ -65 +66 @@
     }
 
+    [StorableConstructor]
+    protected InversionMoveSoftTabuCriterion(bool deserializing) : base(deserializing) { }
+    protected InversionMoveSoftTabuCriterion(InversionMoveSoftTabuCriterion original, Cloner cloner) : base(original, cloner) { }
     public InversionMoveSoftTabuCriterion()
       : base() {
@@ -74 +78 @@
       Parameters.Add(new ValueLookupParameter<BoolValue>("Maximization", "True if the problem is a maximization problem, else if it is a minimization problem."));
       Parameters.Add(new LookupParameter<DoubleValue>("MoveQuality", "The quality of the current move."));
+    }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new InversionMoveSoftTabuCriterion(this, cloner);
     }
 

branches/CloningRefactoring/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/TwoOpt/InversionMoveTabuMaker.cs

@@ -24 +24 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.Encodings.PermutationEncoding {
@@ -36 +37 @@
     }
 
+    [StorableConstructor]
+    protected InversionMoveTabuMaker(bool deserializing) : base(deserializing) { }
+    protected InversionMoveTabuMaker(InversionMoveTabuMaker original, Cloner cloner) : base(original, cloner) { }
     public InversionMoveTabuMaker()
       : base() {
       Parameters.Add(new LookupParameter<InversionMove>("InversionMove", "The move that was made."));
       Parameters.Add(new LookupParameter<Permutation>("Permutation", "The solution as permutation."));
+    }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new InversionMoveTabuMaker(this, cloner);
     }
 

branches/CloningRefactoring/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/TwoOpt/StochasticInversionMultiMoveGenerator.cs

@@ -25 +25 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.Encodings.PermutationEncoding {
@@ -42 +43 @@
     }
 
+    [StorableConstructor]
+    protected StochasticInversionMultiMoveGenerator(bool deserializing) : base(deserializing) { }
+    protected StochasticInversionMultiMoveGenerator(StochasticInversionMultiMoveGenerator original, Cloner cloner) : base(original, cloner) { }
     public StochasticInversionMultiMoveGenerator()
       : base() {
       Parameters.Add(new LookupParameter<IRandom>("Random", "The random number generator."));
       Parameters.Add(new ValueLookupParameter<IntValue>("SampleSize", "The number of moves to generate."));
+    }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new StochasticInversionMultiMoveGenerator(this, cloner);
     }
 

branches/CloningRefactoring/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/TwoOpt/StochasticInversionSingleMoveGenerator.cs

@@ -25 +25 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.Encodings.PermutationEncoding {
@@ -34 +35 @@
     }
 
+    [StorableConstructor]
+    protected StochasticInversionSingleMoveGenerator(bool deserializing) : base(deserializing) { }
+    protected StochasticInversionSingleMoveGenerator(StochasticInversionSingleMoveGenerator original, Cloner cloner) : base(original, cloner) { }
     public StochasticInversionSingleMoveGenerator()
       : base() {
       Parameters.Add(new LookupParameter<IRandom>("Random", "The random number generator."));
+    }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new StochasticInversionSingleMoveGenerator(this, cloner);
     }