Changeset 6796 for branches

Timestamp:

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

Author:

svonolfe

Message:

Fixed issue related to incremental evaluation (#1177)

Location:

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

Files:

• PotvinOneLevelExchangeManipulator.cs (modified) (1 diff)
• PotvinTwoLevelExchangeManipulator.cs (modified) (3 diffs)

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

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

@@ -64 +64 @@
               //customer1 can be feasibly inserted at the location of customer2
               tour.Stops[customer2Position] = customer1;
+              route1.Stops.RemoveAt(customer1Position);
+
               if (ProblemInstance.Feasible(tour)) {
                 int routeIdx, place;
@@ -69 +71 @@
                   customer2, selectedIndex, allowInfeasible, out routeIdx, out place)) {
                   individual.Tours[routeIdx].Stops.Insert(place, customer2);
-                  route1.Stops.RemoveAt(customer1Position);
-
-                  if (route1.Stops.Count == 0)
-                    individual.Tours.Remove(route1);
 
                   //two-level exchange has been performed
@@ -79 +77 @@
                 } else {
                   tour.Stops[customer2Position] = customer2;
+                  route1.Stops.Insert(customer1Position, customer1);
                 }
               } else {
                 tour.Stops[customer2Position] = customer2;
+                route1.Stops.Insert(customer1Position, customer1);
               }
             }