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

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/Potvin

Files:

• Manipulators/PotvinCustomerRelocationManipulator.cs (modified) (2 diffs)
• Moves/PickupDelivery/PDExchange/PotvinPDExchangeExhaustiveMoveGenerator.cs (modified) (1 diff)
• Moves/PickupDelivery/PDExchange/PotvinPDExchangeMoveMaker.cs (modified) (2 diffs)
• Moves/PickupDelivery/PDExchange/PotvinPDExchangeSingleMoveGenerator.cs (modified) (1 diff)
• Moves/PickupDelivery/PDRearrange/PotvinPDRearrangeMoveMaker.cs (modified) (1 diff)
• Moves/PickupDelivery/PDShift/PotvinPDShiftMoveMaker.cs (modified) (1 diff)

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