Changeset 4268 for branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Potvin

Timestamp:

08/19/10 16:51:30 (14 years ago)

Author:

svonolfe

Message:

Added prins encoding (#1039)

Location:

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Potvin

Files:

• Crossovers/PotvinCrossover.cs (modified) (1 diff)
• Manipulators/PotvinManipulator.cs (modified) (1 diff)
• PotvinEncoding.cs (modified) (1 diff)

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Potvin/Crossovers/PotvinCrossover.cs

@@ -129 +129 @@
 
         if (!(solution is PotvinEncoding)) {
-          parents[i] = PotvinEncoding.ConvertFrom(solution);
+          parents[i] = PotvinEncoding.ConvertFrom(solution, DistanceMatrixParameter);
         } else {
           parents[i] = solution;

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Potvin/Manipulators/PotvinManipulator.cs

@@ -82 +82 @@
       IVRPEncoding solution = VRPToursParameter.ActualValue;
       if (!(solution is PotvinEncoding)) {
-        VRPToursParameter.ActualValue = PotvinEncoding.ConvertFrom(solution);
+        VRPToursParameter.ActualValue = PotvinEncoding.ConvertFrom(solution, DistanceMatrixParameter);
       }
       

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Potvin/PotvinEncoding.cs

@@ -53 +53 @@
     }
     
-    public static PotvinEncoding ConvertFrom(IVRPEncoding encoding) {
+    public static PotvinEncoding ConvertFrom(IVRPEncoding encoding, ILookupParameter<DoubleMatrix> distanceMatrix) {
       PotvinEncoding solution = new PotvinEncoding();
 
-      TourEncoding.ConvertFrom(encoding, solution);
+      TourEncoding.ConvertFrom(encoding, solution, distanceMatrix);
 
       return solution;