Changeset 7907 for branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery

Timestamp:

05/25/12 11:34:55 (13 years ago)

Author:

svonolfe

Message:

Merged changes from trunk into branch (#1177)

Location:

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4

Files:

• . (modified) (1 prop)
• Encodings/Potvin/Moves/PickupDelivery/PDExchange/PotvinPDExchangeMove.cs (modified) (1 diff)
• Encodings/Potvin/Moves/PickupDelivery/PDExchange/PotvinPDExchangeMoveMaker.cs (modified) (1 diff)
• Encodings/Potvin/Moves/PickupDelivery/PDRearrange/PotvinPDRearrangeMove.cs (modified) (1 diff)
• Encodings/Potvin/Moves/PickupDelivery/PDRearrange/PotvinPDRearrangeMoveMaker.cs (modified) (1 diff)
• Encodings/Potvin/Moves/PickupDelivery/PDShift/PotvinPDShiftMove.cs (modified) (1 diff)
• Encodings/Potvin/Moves/PickupDelivery/PDShift/PotvinPDShiftMoveMaker.cs (modified) (1 diff)

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDExchange/PotvinPDExchangeMove.cs

@@ -65 +65 @@
       this.Individual = individual.Clone() as PotvinEncoding;
     }
+
+    [StorableConstructor]
+    protected PotvinPDExchangeMove(bool deserializing) : base(deserializing) { }
 
     public override IDeepCloneable Clone(Cloner cloner) {

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDExchange/PotvinPDExchangeMoveMaker.cs

@@ -44 +44 @@
 
     [StorableConstructor]
-    private PotvinPDExchangeMoveMaker(bool deserializing) : base(deserializing) { }
+    protected PotvinPDExchangeMoveMaker(bool deserializing) : base(deserializing) { }
 
     public PotvinPDExchangeMoveMaker()

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDRearrange/PotvinPDRearrangeMove.cs

@@ -70 +70 @@
     }
 
+    [StorableConstructor]
+    protected PotvinPDRearrangeMove(bool deserializing) : base(deserializing) { }
+
     #region IVRPMove Members
 

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDRearrange/PotvinPDRearrangeMoveMaker.cs

@@ -44 +44 @@
 
     [StorableConstructor]
-    private PotvinPDRearrangeMoveMaker(bool deserializing) : base(deserializing) { }
+    protected PotvinPDRearrangeMoveMaker(bool deserializing) : base(deserializing) { }
 
     public PotvinPDRearrangeMoveMaker()

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDShift/PotvinPDShiftMove.cs

@@ -75 +75 @@
     }
 
+    [StorableConstructor]
+    protected PotvinPDShiftMove(bool deserializing) : base(deserializing) { }
+
     #region IVRPMove Members
 

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDShift/PotvinPDShiftMoveMaker.cs

@@ -45 +45 @@
 
     [StorableConstructor]
-    private PotvinPDShiftMoveMaker(bool deserializing) : base(deserializing) { }
+    protected PotvinPDShiftMoveMaker(bool deserializing) : base(deserializing) { }
 
     public PotvinPDShiftMoveMaker()