Changeset 6856 for branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/ExtendedPotvin/Creators

Timestamp:

09/30/11 13:51:01 (13 years ago)

Author:

svonolfe

Message:

Added support for the multi depot pickup and delivery problem with time windows (#1177)

Location:

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/ExtendedPotvin/Creators

Files:

• IterativeInsertionCreator.cs (modified) (3 diffs)
• PushForwardInsertionCreator.cs (modified) (4 diffs)

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/ExtendedPotvin/Creators/IterativeInsertionCreator.cs

@@ -113 +113 @@
 
         if (pdp != null) {
-          stopIdx = result.FindBestInsertionPlace(currentTour, pdp.PickupDeliveryLocation[customers[index]]);
-          currentTour.Stops.Insert(stopIdx, pdp.PickupDeliveryLocation[customers[index]]);
+          stopIdx = result.FindBestInsertionPlace(currentTour, pdp.GetPickupDeliveryLocation(customers[index]));
+          currentTour.Stops.Insert(stopIdx, pdp.GetPickupDeliveryLocation(customers[index]));
         }
 
@@ -122 +122 @@
             currentTour.Stops.Remove(customers[index]);
             if (pdp != null)
-              currentTour.Stops.Remove(pdp.PickupDeliveryLocation[customers[index]]);
+              currentTour.Stops.Remove(pdp.GetPickupDeliveryLocation(customers[index]));
 
           if (currentTour.Stops.Count == 0)
@@ -131 +131 @@
           currentTour.Stops.Add(customers[index]);
           if (pdp != null) {
-            currentTour.Stops.Add(pdp.PickupDeliveryLocation[customers[index]]);
+            currentTour.Stops.Add(pdp.GetPickupDeliveryLocation(customers[index]));
           }
         }

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/ExtendedPotvin/Creators/PushForwardInsertionCreator.cs

@@ -213 +213 @@
 
         if (pdp != null) {
-          tour.Stops.Add(pdp.PickupDeliveryLocation[unroutedList[0]]);
+          tour.Stops.Add(pdp.GetPickupDeliveryLocation(unroutedList[0]));
         }
 
@@ -234 +234 @@
                   bool feasible;
                   cost = tourCost +
-                    problemInstance.GetInsertionCosts(eval, result, pdp.PickupDeliveryLocation[unroutedList[c]], 0, j, out feasible);
+                    problemInstance.GetInsertionCosts(eval, result, pdp.GetPickupDeliveryLocation(unroutedList[c]), 0, j, out feasible);
                   if (cost < minimumCost && feasible) {
                     minimumCost = cost;
@@ -260 +260 @@
             tour.Stops.Insert(indexOfMinimumCost, unroutedList[indexOfCustomer]);
             if (pdp != null) {
-              tour.Stops.Insert(indexOfMinimumCost2, pdp.PickupDeliveryLocation[unroutedList[indexOfCustomer]]);
+              tour.Stops.Insert(indexOfMinimumCost2, pdp.GetPickupDeliveryLocation(unroutedList[indexOfCustomer]));
             }
 
@@ -275 +275 @@
             tour.Stops.Add(unroutedList[0]);
             if (pdp != null) {
-              tour.Stops.Add(pdp.PickupDeliveryLocation[unroutedList[0]]);
+              tour.Stops.Add(pdp.GetPickupDeliveryLocation(unroutedList[0]));
             }