Changeset 4186 for trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Potvin/Crossovers

Timestamp:

08/10/10 17:40:41 (14 years ago)

Author:

svonolfe

Message:

Added some Potvin operators (RBX, SBX, LSM) (#1039)

Location:

trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Potvin/Crossovers

Files:

• PotvinCrossover.cs (modified) (1 diff)
• RouteBasedCrossover.cs (added)
• SequenceBasedCrossover.cs (modified) (2 diffs)
• SequenceBasedCrossover2.cs (added)

trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Potvin/Crossovers/PotvinCrossover.cs

@@ -51 +51 @@
         DistanceMatrixParameter, UseDistanceMatrixParameter.ActualValue,
         city, -1, out route, out place);
+    }
+
+    protected Tour FindRoute(PotvinEncoding solution, int city) {
+      Tour found = null;
+
+      foreach (Tour tour in solution.Tours) {
+        if (tour.Cities.Contains(city)) {
+          found = tour;
+          break;
+        }
+      }
+
+      return found;
     }
 

trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Potvin/Crossovers/SequenceBasedCrossover.cs

@@ -35 +35 @@
     public SequenceBasedCrossover()
       : base() { }
-    
-    private Tour FindRoute(PotvinEncoding solution, int city) {
-      Tour found = null;
-
-      foreach (Tour tour in solution.Tours) {
-        if (tour.Cities.Contains(city)) {
-          found = tour;
-          break;
-        }
-      }
-
-      return found;
-    }
-    
+        
     protected override PotvinEncoding Crossover(IRandom random, PotvinEncoding parent1, PotvinEncoding parent2) {
       PotvinEncoding child = parent1.Clone() as PotvinEncoding;
@@ -78 +65 @@
           child.Unrouted.Add(city);
 
-      if (Repair(random, child, newTour))
+      if (Feasible(newTour) &&
+          Repair(random, child, newTour)) {
         return child;
-      else {
-        if(random.NextDouble() < 0.5)
+      } else {
+        if (random.NextDouble() < 0.5)
           return parent1.Clone() as PotvinEncoding;
         else