Changeset 6881 for branches

Timestamp:

10/06/11 11:39:21 (13 years ago)

Author:

svonolfe

Message:

Fixed small issue in PFIH (#1177)

File:

• branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Creators/PushForwardInsertionCreator.cs (modified) (5 diffs)

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

@@ -213 +213 @@
       List<int> unroutedCustomers = new List<int>();
       for (int i = 1; i <= problemInstance.Cities.Value; i++) {
-        if (pdp == null ||
-           (problemInstance.GetDemand(i) >= 0 ||
-            pdp.GetPickupDeliveryLocation(i) <= 0))
+        if (pdp == null || (problemInstance.GetDemand(i) >= 0))
           unroutedCustomers.Add(i);
       }
@@ -271 +269 @@
 
       tour.Stops.Add(currentCustomer);
-      if (pdp != null && pdp.GetPickupDeliveryLocation(currentCustomer) > 0) {
+      if (pdp != null) {
         tour.Stops.Add(pdp.GetPickupDeliveryLocation(currentCustomer));
       }
@@ -291 +289 @@
             double tourCost = eval.Quality - originalCosts;
 
-            if (pdp != null && pdp.GetPickupDeliveryLocation(unrouted) > 0) {
+            if (pdp != null) {
               for (int j = i + 1; j <= tour.Stops.Count; j++) {
                 bool feasible;
@@ -326 +324 @@
         if (indexOfMinimumCost != -1) {
           tour.Stops.Insert(indexOfMinimumCost, customer);
-          if (pdp != null && pdp.GetPickupDeliveryLocation(customer) > 0) {
+          if (pdp != null) {
             tour.Stops.Insert(indexOfMinimumCost2, pdp.GetPickupDeliveryLocation(customer));
           }
@@ -349 +347 @@
 
           tour.Stops.Add(currentCustomer);
-          if (pdp != null && pdp.GetPickupDeliveryLocation(currentCustomer) > 0) {
+          if (pdp != null) {
             tour.Stops.Add(pdp.GetPickupDeliveryLocation(currentCustomer));
           }