Changeset 7907

Timestamp:

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

Author:

svonolfe

Message:

Merged changes from trunk into branch (#1177)

Location:

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4

Files:

• . (modified) (1 prop)
• Analyzer/ConstraintRelaxation/Capacitated/CapacityRelaxationVRPAnalyzer.cs (modified) (2 diffs)
• Analyzer/ConstraintRelaxation/PickupAndDelivery/PickupViolationsRelaxationVRPAnalyzer.cs (modified) (2 diffs)
• Analyzer/ConstraintRelaxation/TimeWindowed/TimeWindowRelaxationVRPAnalyzer.cs (modified) (2 diffs)
• Analyzer/VRPSolution.cs (modified) (1 diff)
• Encodings/Alba/AlbaEncoding.cs (modified) (1 diff)
• Encodings/Alba/Moves/IntraRouteInversion/AlbaIntraRouteInversionMoveMaker.cs (modified) (1 diff)
• Encodings/Alba/Moves/LambdaInterchange/AlbaLambdaInterchangeMove.cs (modified) (1 diff)
• Encodings/Alba/Moves/LambdaInterchange/AlbaLambdaInterchangeMoveMaker.cs (modified) (1 diff)
• Encodings/GVR/GVREncoding.cs (modified) (1 diff)
• Encodings/General/Creators/MultiVRPSolutionCreator.cs (modified) (1 diff)
• Encodings/General/Moves/MultiVRPMoveOperator/MultiVRPMoveGenerator.cs (modified) (1 diff)
• Encodings/General/Moves/MultiVRPMoveOperator/MultiVRPMoveMaker.cs (modified) (1 diff)
• Encodings/General/Moves/MultiVRPMoveOperator/MultiVRPMoveTabuChecker.cs (modified) (1 diff)
• Encodings/General/Moves/MultiVRPMoveOperator/MultiVRPMoveTabuMaker.cs (modified) (1 diff)
• Encodings/General/PermutationEncoding.cs (modified) (1 diff)
• Encodings/General/TourEncoding.cs (modified) (1 diff)
• Encodings/Potvin/Moves/CustomerRelocation/PotvinCustomerRelocationExhaustiveMoveGenerator.cs (modified) (1 diff)
• Encodings/Potvin/Moves/CustomerRelocation/PotvinCustomerRelocationMove.cs (modified) (1 diff)
• Encodings/Potvin/Moves/CustomerRelocation/PotvinCustomerRelocationMoveMaker.cs (modified) (1 diff)
• Encodings/Potvin/Moves/CustomerRelocation/PotvinCustomerRelocationMultiMoveGenerator.cs (modified) (1 diff)
• Encodings/Potvin/Moves/CustomerRelocation/PotvinCustomerRelocationSingleMoveGenerator.cs (modified) (1 diff)
• 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)
• Encodings/Potvin/Moves/TwoOptStar/PotvinTwoOptStarExhaustiveMoveGenerator.cs (modified) (1 diff)
• Encodings/Potvin/Moves/TwoOptStar/PotvinTwoOptStarMove.cs (modified) (1 diff)
• Encodings/Potvin/Moves/TwoOptStar/PotvinTwoOptStarMoveMaker.cs (modified) (1 diff)
• Encodings/Potvin/Moves/TwoOptStar/PotvinTwoOptStarMultiMoveGenerator.cs (modified) (1 diff)
• Encodings/Potvin/Moves/TwoOptStar/PotvinTwoOptStarSingleMoveGenerator.cs (modified) (1 diff)
• Encodings/Potvin/Moves/VehicleAssignment/PotvinVehicleAssignmentExhaustiveMoveGenerator.cs (modified) (1 diff)
• Encodings/Potvin/Moves/VehicleAssignment/PotvinVehicleAssignmentMove.cs (modified) (1 diff)
• Encodings/Potvin/Moves/VehicleAssignment/PotvinVehicleAssignmentMoveMaker.cs (modified) (1 diff)
• Encodings/Potvin/Moves/VehicleAssignment/PotvinVehicleAssignmentMultiMoveGenerator.cs (modified) (1 diff)
• Encodings/Potvin/Moves/VehicleAssignment/PotvinVehicleAssignmentSingleMoveGenerator.cs (modified) (1 diff)
• Encodings/Prins/PrinsEncoding.cs (modified) (1 diff)
• Encodings/Tour.cs (modified) (1 diff)
• Encodings/Zhu/ZhuEncoding.cs (modified) (1 diff)
• VehicleRoutingProblem.cs (modified) (1 diff)

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Analyzer/ConstraintRelaxation/Capacitated/CapacityRelaxationVRPAnalyzer.cs

@@ -74 +74 @@
 
     [StorableConstructor]
-    private CapacityRelaxationVRPAnalyzer(bool deserializing) : base(deserializing) { }
+    protected CapacityRelaxationVRPAnalyzer(bool deserializing) : base(deserializing) { }
 
     public CapacityRelaxationVRPAnalyzer()
@@ -95 +95 @@
     }
 
-    private CapacityRelaxationVRPAnalyzer(CapacityRelaxationVRPAnalyzer original, Cloner cloner)
+    protected CapacityRelaxationVRPAnalyzer(CapacityRelaxationVRPAnalyzer original, Cloner cloner)
       : base(original, cloner) {
     }

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Analyzer/ConstraintRelaxation/PickupAndDelivery/PickupViolationsRelaxationVRPAnalyzer.cs

@@ -74 +74 @@
 
     [StorableConstructor]
-    private PickupViolationsRelaxationVRPAnalyzer(bool deserializing) : base(deserializing) { }
+    protected PickupViolationsRelaxationVRPAnalyzer(bool deserializing) : base(deserializing) { }
 
     public PickupViolationsRelaxationVRPAnalyzer()
@@ -95 +95 @@
     }
 
-    private PickupViolationsRelaxationVRPAnalyzer(PickupViolationsRelaxationVRPAnalyzer original, Cloner cloner)
+    protected PickupViolationsRelaxationVRPAnalyzer(PickupViolationsRelaxationVRPAnalyzer original, Cloner cloner)
       : base(original, cloner) {
     }

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Analyzer/ConstraintRelaxation/TimeWindowed/TimeWindowRelaxationVRPAnalyzer.cs

@@ -74 +74 @@
 
     [StorableConstructor]
-    private TimeWindowRelaxationVRPAnalyzer(bool deserializing) : base(deserializing) { }
+    protected TimeWindowRelaxationVRPAnalyzer(bool deserializing) : base(deserializing) { }
 
     public TimeWindowRelaxationVRPAnalyzer()
@@ -95 +95 @@
     }
 
-    private TimeWindowRelaxationVRPAnalyzer(TimeWindowRelaxationVRPAnalyzer original, Cloner cloner)
+    protected TimeWindowRelaxationVRPAnalyzer(TimeWindowRelaxationVRPAnalyzer original, Cloner cloner)
       : base(original, cloner) {
     }

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Analyzer/VRPSolution.cs

@@ -106 +106 @@
     private VRPSolution(VRPSolution original, Cloner cloner)
       : base(original, cloner) {
-      this.problemInstance = original.problemInstance;
       this.solution = (IVRPEncoding)cloner.Clone(original.solution);
       this.quality = (DoubleValue)cloner.Clone(original.quality);
+
+      if (original.ProblemInstance != null && cloner.ClonedObjectRegistered(original.ProblemInstance))
+        this.ProblemInstance = (IVRPProblemInstance)cloner.Clone(original.ProblemInstance);
+      else
+        this.ProblemInstance = original.ProblemInstance;
 
       this.Initialize();

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/AlbaEncoding.cs

@@ -109 +109 @@
 
     [StorableConstructor]
-    private AlbaEncoding(bool serializing)
+    protected AlbaEncoding(bool serializing)
       : base(serializing) {
     }

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

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

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Moves/LambdaInterchange/AlbaLambdaInterchangeMove.cs

@@ -80 +80 @@
     }
 
+    [StorableConstructor]
+    protected AlbaLambdaInterchangeMove(bool deserializing) : base(deserializing) { }
+
     public override IDeepCloneable Clone(Cloner cloner) {
       return new AlbaLambdaInterchangeMove(this, cloner);

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Moves/LambdaInterchange/AlbaLambdaInterchangeMoveMaker.cs

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

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/GVR/GVREncoding.cs

@@ -83 +83 @@
 
     [StorableConstructor]
-    private GVREncoding(bool serializing)
+    protected GVREncoding(bool serializing)
       : base(serializing) {
     }

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/Creators/MultiVRPSolutionCreator.cs

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

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/Moves/MultiVRPMoveOperator/MultiVRPMoveGenerator.cs

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

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/Moves/MultiVRPMoveOperator/MultiVRPMoveMaker.cs

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

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/Moves/MultiVRPMoveOperator/MultiVRPMoveTabuChecker.cs

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

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/Moves/MultiVRPMoveOperator/MultiVRPMoveTabuMaker.cs

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

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/PermutationEncoding.cs

@@ -60 +60 @@
     protected PermutationEncoding(PermutationEncoding original, Cloner cloner)
       : base(original, cloner) {
-        this.ProblemInstance = original.ProblemInstance;
         this.readOnly = original.readOnly;
+
+        if (original.ProblemInstance != null && cloner.ClonedObjectRegistered(original.ProblemInstance))
+          this.ProblemInstance = (IVRPProblemInstance)cloner.Clone(original.ProblemInstance);
+        else
+          this.ProblemInstance = original.ProblemInstance;
     }
 

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/TourEncoding.cs

@@ -115 +115 @@
       : base(original, cloner) {
        this.Tours = (ItemList<Tour>)cloner.Clone(original.Tours);
-       this.ProblemInstance = original.ProblemInstance;
+       if (original.ProblemInstance != null && cloner.ClonedObjectRegistered(original.ProblemInstance))
+         this.ProblemInstance = (IVRPProblemInstance)cloner.Clone(original.ProblemInstance);
+       else
+         this.ProblemInstance = original.ProblemInstance;
     }
 

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/CustomerRelocation/PotvinCustomerRelocationExhaustiveMoveGenerator.cs

@@ -44 +44 @@
     }
 
-    private PotvinCustomerRelocationExhaustiveMoveGenerator(PotvinCustomerRelocationMoveGenerator original, Cloner cloner)
+    private PotvinCustomerRelocationExhaustiveMoveGenerator(PotvinCustomerRelocationExhaustiveMoveGenerator original, Cloner cloner)
       : base(original, cloner) {
     }

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/CustomerRelocation/PotvinCustomerRelocationMove.cs

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

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/CustomerRelocation/PotvinCustomerRelocationMoveMaker.cs

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

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/CustomerRelocation/PotvinCustomerRelocationMultiMoveGenerator.cs

@@ -56 +56 @@
     }
 
-    private PotvinCustomerRelocationMultiMoveGenerator(PotvinCustomerRelocationMoveGenerator original, Cloner cloner)
+    private PotvinCustomerRelocationMultiMoveGenerator(PotvinCustomerRelocationMultiMoveGenerator original, Cloner cloner)
       : base(original, cloner) {
     }

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/CustomerRelocation/PotvinCustomerRelocationSingleMoveGenerator.cs

@@ -60 +60 @@
     }
 
-    private PotvinCustomerRelocationSingleMoveGenerator(PotvinCustomerRelocationMoveGenerator original, Cloner cloner)
+    private PotvinCustomerRelocationSingleMoveGenerator(PotvinCustomerRelocationSingleMoveGenerator original, Cloner cloner)
       : base(original, cloner) {
     }

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()

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/TwoOptStar/PotvinTwoOptStarExhaustiveMoveGenerator.cs

@@ -44 +44 @@
     }
 
-    private PotvinTwoOptStarExhaustiveMoveGenerator(PotvinTwoOptStarMoveGenerator original, Cloner cloner)
+    private PotvinTwoOptStarExhaustiveMoveGenerator(PotvinTwoOptStarExhaustiveMoveGenerator original, Cloner cloner)
       : base(original, cloner) {
     }

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/TwoOptStar/PotvinTwoOptStarMove.cs

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

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/TwoOptStar/PotvinTwoOptStarMoveMaker.cs

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

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/TwoOptStar/PotvinTwoOptStarMultiMoveGenerator.cs

@@ -56 +56 @@
     }
 
-    private PotvinTwoOptStarMultiMoveGenerator(PotvinTwoOptStarMoveGenerator original, Cloner cloner)
+    private PotvinTwoOptStarMultiMoveGenerator(PotvinTwoOptStarMultiMoveGenerator original, Cloner cloner)
       : base(original, cloner) {
     }

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/TwoOptStar/PotvinTwoOptStarSingleMoveGenerator.cs

@@ -60 +60 @@
     }
 
-    private PotvinTwoOptStarSingleMoveGenerator(PotvinTwoOptStarMoveGenerator original, Cloner cloner)
+    private PotvinTwoOptStarSingleMoveGenerator(PotvinTwoOptStarSingleMoveGenerator original, Cloner cloner)
       : base(original, cloner) {
     }

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/VehicleAssignment/PotvinVehicleAssignmentExhaustiveMoveGenerator.cs

@@ -44 +44 @@
     }
 
-    private PotvinVehicleAssignmentExhaustiveMoveGenerator(PotvinVehicleAssignmentMoveGenerator original, Cloner cloner)
+    private PotvinVehicleAssignmentExhaustiveMoveGenerator(PotvinVehicleAssignmentExhaustiveMoveGenerator original, Cloner cloner)
       : base(original, cloner) {
     }

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/VehicleAssignment/PotvinVehicleAssignmentMove.cs

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

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/VehicleAssignment/PotvinVehicleAssignmentMoveMaker.cs

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

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/VehicleAssignment/PotvinVehicleAssignmentMultiMoveGenerator.cs

@@ -56 +56 @@
     }
 
-    private PotvinVehicleAssignmentMultiMoveGenerator(PotvinVehicleAssignmentMoveGenerator original, Cloner cloner)
+    private PotvinVehicleAssignmentMultiMoveGenerator(PotvinVehicleAssignmentMultiMoveGenerator original, Cloner cloner)
       : base(original, cloner) {
     }

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/VehicleAssignment/PotvinVehicleAssignmentSingleMoveGenerator.cs

@@ -60 +60 @@
     }
 
-    private PotvinVehicleAssignmentSingleMoveGenerator(PotvinVehicleAssignmentMoveGenerator original, Cloner cloner)
+    private PotvinVehicleAssignmentSingleMoveGenerator(PotvinVehicleAssignmentSingleMoveGenerator original, Cloner cloner)
       : base(original, cloner) {
     }

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Prins/PrinsEncoding.cs

@@ -140 +140 @@
 
     [StorableConstructor]
-    private PrinsEncoding(bool serializing)
+    protected PrinsEncoding(bool serializing)
       : base(serializing) {
     }

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Tour.cs

@@ -48 +48 @@
     }
 
+    [StorableConstructor]
+    protected Tour(bool deserializing) : base(deserializing) { }
+
     public double GetTourLength(IVRPProblemInstance instance, IVRPEncoding solution) {
       double length = 0;

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Zhu/ZhuEncoding.cs

@@ -110 +110 @@
 
     [StorableConstructor]
-    private ZhuEncoding(bool serializing)
+    protected ZhuEncoding(bool serializing)
       : base(serializing) {
     }

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/VehicleRoutingProblem.cs

@@ -143 +143 @@
 
     public override IDeepCloneable Clone(Cloner cloner) {
+      cloner.Clone(ProblemInstance);
       return new VehicleRoutingProblem(this, cloner);
     }