Changeset 6796 for branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Manipulators/PotvinOneLevelExchangeManipulator.cs

Timestamp:

09/19/11 14:24:19 (13 years ago)

Author:

svonolfe

Message:

Fixed issue related to incremental evaluation (#1177)

File:

• branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Manipulators/PotvinOneLevelExchangeManipulator.cs (modified) (1 diff)

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

@@ -52 +52 @@
         individual.Tours[selectedIndex];
 
-      List<int> replaced = new List<int>();
-      for (int i = 0; i < route1.Stops.Count; i++) {
+      int count = route1.Stops.Count;
+      int i = 0;
+      while(i < count) {
         int insertedRoute, insertedPlace;
 
-        if (FindInsertionPlace(individual, route1.Stops[i], selectedIndex, allowInfeasible, out insertedRoute, out insertedPlace)) {
-          individual.Tours[insertedRoute].Stops.Insert(insertedPlace, route1.Stops[i]);
-          replaced.Add(route1.Stops[i]);
+        int city = route1.Stops[i];
+        route1.Stops.Remove(city);
+
+        if (FindInsertionPlace(individual, city, selectedIndex, allowInfeasible, out insertedRoute, out insertedPlace)) {
+          individual.Tours[insertedRoute].Stops.Insert(insertedPlace, city);
+        } else {
+          route1.Stops.Insert(i, city);
+          i++;
         }
+
+        count = route1.Stops.Count;
       }
 
-      route1.Stops.RemoveAll(
-        new System.Predicate<int>( 
-          delegate(int val) {
-            return (replaced.Contains(val)); 
-          }
-        )
-      );
-
-      if (route1.Stops.Count == 0)
-        individual.Tours.Remove(route1);
     }
   }