Changeset 4265

Timestamp:

08/19/10 14:37:48 (14 years ago)

Author:

svonolfe

Message:

Fixed a bug in the Local search manipulator (#1039)

File:

• branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Potvin/Manipulators/LocalSearchManipulator.cs (modified) (4 diffs)

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Potvin/Manipulators/LocalSearchManipulator.cs

@@ -31 +31 @@
   [StorableClass]
   public sealed class LocalSearchManipulator : PotvinManipulator {
+    public IValueParameter<IntValue> Iterations {
+      get { return (IValueParameter<IntValue>)Parameters["Iterations"]; }
+    }
+
     [StorableConstructor]
     private LocalSearchManipulator(bool deserializing) : base(deserializing) { }
 
-    public LocalSearchManipulator() : base() { }
+    public LocalSearchManipulator() : base() {
+      Parameters.Add(new ValueParameter<IntValue>("Iterations", "The number of max iterations.", new IntValue(100)));
+    }
 
     private bool FindBetterInsertionPlace(
@@ -80 +86 @@
       if (Feasible(individual)) {
         bool insertionFound;
+        int iterations = 0;
 
         do {
@@ -99 +106 @@
                   individual.Tours[insertionTour].Cities.InsertRange(
                     insertionPlace,
-                    toBeInserted);
+                    toBeInserted); 
                 }
                 city++;
@@ -107 +114 @@
             length--;
           }
-        } while (insertionFound);
+          iterations++;
+        } while (insertionFound && 
+          iterations < Iterations.Value.Value);
+
+        IList<Tour> toBeRemoved = new List<Tour>();
+        foreach (Tour tour in individual.Tours) {
+          if (tour.Cities.Count == 0)
+            toBeRemoved.Add(tour);
+        }
+
+        foreach (Tour tour in toBeRemoved) {
+          individual.Tours.Remove(tour);
+        }
       }
     }