Changeset 7906 for trunk/sources/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General

Timestamp:

05/25/12 11:32:22 (13 years ago)

Author:

svonolfe

Message:

Fixed issues that prevented the unit tests to pass (#1177)

Location:

trunk/sources/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General

Files:

• Creators/MultiVRPSolutionCreator.cs (modified) (1 diff)
• Moves/MultiVRPMoveOperator/MultiVRPMoveGenerator.cs (modified) (1 diff)
• Moves/MultiVRPMoveOperator/MultiVRPMoveMaker.cs (modified) (1 diff)
• Moves/MultiVRPMoveOperator/MultiVRPMoveTabuChecker.cs (modified) (1 diff)
• Moves/MultiVRPMoveOperator/MultiVRPMoveTabuMaker.cs (modified) (1 diff)
• PermutationEncoding.cs (modified) (1 diff)
• TourEncoding.cs (modified) (1 diff)

trunk/sources/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() {

trunk/sources/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() {

trunk/sources/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()

trunk/sources/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()

trunk/sources/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()

trunk/sources/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;
     }
 

trunk/sources/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;
     }