Changeset 5867 for branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Moves/IntraRouteInversion/AlbaIntraRouteInversionMove.cs

Timestamp:

03/29/11 15:40:01 (13 years ago)

Author:

svonolfe

Message:

Merged changes from trunk into branch (#1177)

File:

• branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Moves/IntraRouteInversion/AlbaIntraRouteInversionMove.cs (modified) (2 diffs)

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Moves/IntraRouteInversion/AlbaIntraRouteInversionMove.cs

@@ -33 +33 @@
   public class AlbaIntraRouteInversionMove : TwoIndexMove, IVRPMove {
     public IVRPEncoding Individual { get { return Permutation as AlbaEncoding; } }
-    
+
+    [StorableConstructor]
+    protected AlbaIntraRouteInversionMove(bool deserializing) : base(deserializing) { }
+
+    protected AlbaIntraRouteInversionMove(AlbaIntraRouteInversionMove original, Cloner cloner)
+      : base(original, cloner) {
+    }
+
     public AlbaIntraRouteInversionMove()
       : base() {
@@ -43 +50 @@
 
     public AlbaIntraRouteInversionMove(int index1, int index2, AlbaEncoding permutation)
-      : base(index1, index2, permutation.Clone() as AlbaEncoding) {
+      : base(index1, index2, null) {
+        this.Permutation = permutation.Clone() as AlbaEncoding;
      }
 
     public override IDeepCloneable Clone(Cloner cloner) {
       return new AlbaIntraRouteInversionMove(this, cloner);
-    }
-
-    protected AlbaIntraRouteInversionMove(AlbaIntraRouteInversionMove original, Cloner cloner)
-      : base(original, cloner) {
-        if (Permutation != null)
-          this.Permutation = cloner.Clone(original.Permutation);
     }