Changeset 6851 for branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/GVR

Timestamp:

09/29/11 15:51:56 (13 years ago)

Author:

svonolfe

Message:

Added support for multi depot CVRP instances (#1177)

Location:

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

Files:

• Crossovers/GVRCrossover.cs (modified) (1 diff)
• GVREncoding.cs (modified) (3 diffs)

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/GVR/Crossovers/GVRCrossover.cs

@@ -82 +82 @@
       for (int i = 1; i <= ProblemInstance.Cities.Value; i++) {
         if (!subroute.Contains(i)) {
-          double distance = ProblemInstance.GetDistance(subroute[0], i);
+          double distance = ProblemInstance.GetDistance(subroute[0], i, child);
 
           if (customer == -1 || distance < minDistance) {

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

@@ -42 +42 @@
         double currentDemand = 0;
 
-        DoubleArray demand = ProblemInstance.Demand;
         DoubleValue capacity = new DoubleValue(double.MaxValue);
         if (ProblemInstance is IHomogenousCapacitatedProblemInstance) {
@@ -50 +49 @@
 
         foreach (int city in tour.Stops) {
-          currentDemand += demand[city];
+          currentDemand += ProblemInstance.GetDemand(city);
 
           if (currentDemand > capacity.Value) {
@@ -58 +57 @@
             newTour = new Tour();
             newTour.Stops.Add(city);
-            currentDemand = demand[city];
+            currentDemand = ProblemInstance.GetDemand(city);
           } else {
             newTour.Stops.Add(city);