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

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

Files:

• ExtendedPotvin/Creators/IterativeInsertionCreator.cs (modified) (3 diffs)
• ExtendedPotvin/Creators/PushForwardInsertionCreator.cs (modified) (4 diffs)
• Potvin/Manipulators/PotvinCustomerRelocationManipulator.cs (modified) (2 diffs)
• Potvin/Moves/PickupDelivery/PDExchange/PotvinPDExchangeExhaustiveMoveGenerator.cs (modified) (1 diff)
• Potvin/Moves/PickupDelivery/PDExchange/PotvinPDExchangeMoveMaker.cs (modified) (2 diffs)
• Potvin/Moves/PickupDelivery/PDExchange/PotvinPDExchangeSingleMoveGenerator.cs (modified) (1 diff)
• Potvin/Moves/PickupDelivery/PDRearrange/PotvinPDRearrangeMoveMaker.cs (modified) (1 diff)
• Potvin/Moves/PickupDelivery/PDShift/PotvinPDShiftMoveMaker.cs (modified) (1 diff)

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]));
             }
 

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Manipulators/PotvinCustomerRelocationManipulator.cs

@@ -68 +68 @@
           int stop = route1.Stops[i];
           if (ProblemInstance.GetDemand(stop) < 0) {
-            int source = pdp.PickupDeliveryLocation[stop];
+            int source = pdp.GetPickupDeliveryLocation(stop);
 
             if (!visited.ContainsKey(source))
@@ -81 +81 @@
             deliveryViolations[random.Next(deliveryViolations.Count)];
 
-          int source = pdp.PickupDeliveryLocation[selected];
+          int source = pdp.GetPickupDeliveryLocation(selected);
 
           //find route of source

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDExchange/PotvinPDExchangeExhaustiveMoveGenerator.cs

@@ -67 +67 @@
                   if (pdp == null || pdp.GetDemand(city2) >= 0) {
                     bool valid = pdp == null ||
-                      (pdp.PickupDeliveryLocation[city2] != pdp.PickupDeliveryLocation[city1] &&
-                       pdp.PickupDeliveryLocation[city2] != city1 &&
-                       pdp.PickupDeliveryLocation[city1] != city2);
+                      (pdp.GetPickupDeliveryLocation(city2) != pdp.GetPickupDeliveryLocation(city1) &&
+                       pdp.GetPickupDeliveryLocation(city2) != city1 &&
+                       pdp.GetPickupDeliveryLocation(city1) != city2);
 
                     if (valid) {

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDExchange/PotvinPDExchangeMoveMaker.cs

@@ -68 +68 @@
 
       if (problemInstance is IPickupAndDeliveryProblemInstance) {
-        IntArray pickupLocation =
-          (problemInstance as IPickupAndDeliveryProblemInstance).PickupDeliveryLocation;
+        IPickupAndDeliveryProblemInstance pdp = problemInstance as IPickupAndDeliveryProblemInstance;
 
-        int location = pickupLocation[move.City];
+        int location = pdp.GetPickupDeliveryLocation(move.City);
         Tour oldTour2 = solution.Tours.Find(t => t.Stops.Contains(location));
         oldTour2.Stops.Remove(location);
 
-        location = pickupLocation[move.Replaced];
+        location = pdp.GetPickupDeliveryLocation(move.Replaced);
         oldTour2 = solution.Tours.Find(t => t.Stops.Contains(location));
 
@@ -81 +80 @@
         tour.Stops.Remove(move.Replaced);
 
-        PotvinPDRearrangeMoveMaker.InsertPair(solution, tour, move.City, pickupLocation[move.City], problemInstance);
-        PotvinPDRearrangeMoveMaker.InsertPair(solution, oldTour, move.Replaced, pickupLocation[move.Replaced], problemInstance);
+        PotvinPDRearrangeMoveMaker.InsertPair(solution, tour, move.City, pdp.GetPickupDeliveryLocation(move.City), problemInstance);
+        PotvinPDRearrangeMoveMaker.InsertPair(solution, oldTour, move.Replaced, pdp.GetPickupDeliveryLocation(move.Replaced), problemInstance);
       } else {
         tour.Stops.Remove(move.Replaced);

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDExchange/PotvinPDExchangeSingleMoveGenerator.cs

@@ -85 +85 @@
           if (pdp == null ||
             (pdp.GetDemand(stop) >= 0 &&
-             pdp.PickupDeliveryLocation[stop] != pdp.PickupDeliveryLocation[city] &&
-             pdp.PickupDeliveryLocation[stop] != city &&
-             pdp.PickupDeliveryLocation[city] != stop))
+            pdp.GetPickupDeliveryLocation(stop) != pdp.GetPickupDeliveryLocation(city) &&
+            pdp.GetPickupDeliveryLocation(stop) != city &&
+            pdp.GetPickupDeliveryLocation(city) != stop))
             tourCities.Add(stop);
         }

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDRearrange/PotvinPDRearrangeMoveMaker.cs

@@ -97 +97 @@
       IPickupAndDeliveryProblemInstance pdp = problemInstance as IPickupAndDeliveryProblemInstance;
       if (pdp != null) {
-        int location = pdp.PickupDeliveryLocation[move.City];
+        int location = pdp.GetPickupDeliveryLocation(move.City);
         Tour tour2 = solution.Tours.Find(t => t.Stops.Contains(location));
         int position2 = tour2.Stops.IndexOf(location);

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDShift/PotvinPDShiftMoveMaker.cs

@@ -68 +68 @@
 
       if (problemInstance is IPickupAndDeliveryProblemInstance) {
-        IntArray pickupLocation =
-          (problemInstance as IPickupAndDeliveryProblemInstance).PickupDeliveryLocation;
-
-        int location = pickupLocation[move.City];
+        IPickupAndDeliveryProblemInstance pdp = problemInstance as IPickupAndDeliveryProblemInstance;
+        
+        int location = pdp.GetPickupDeliveryLocation(move.City);
         Tour oldTour2 = solution.Tours.Find(t => t.Stops.Contains(location));
         oldTour2.Stops.Remove(location);
 
-        PotvinPDRearrangeMoveMaker.InsertPair(solution, tour, move.City, pickupLocation[move.City], problemInstance);
+        PotvinPDRearrangeMoveMaker.InsertPair(solution, tour, move.City, location, problemInstance);
       } else {
         int place = solution.FindBestInsertionPlace(tour, move.City);