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

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

Files:

• Crossovers/PotvinCrossover.cs (modified) (1 diff)
• Crossovers/RouteBasedCrossover.cs (added)
• Crossovers/SequenceBasedCrossover.cs (modified) (2 diffs)
• Crossovers/SequenceBasedCrossover2.cs (added)
• Manipulators/LocalSearchManipulator.cs (added)
• Manipulators/TwoLevelExchangeManipulator.cs (modified) (1 diff)

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

trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Potvin/Manipulators/TwoLevelExchangeManipulator.cs

@@ -28 +28 @@
 
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
-  [Item("TwoLevelExchangeOperator", "The 2M operator which manipulates a Potvin VRP representation.  It is implemented as described in Potvin, J.-Y. and Bengio, S. (1996). The Vehicle Routing Problem with Time Windows - Part II: Genetic Search. INFORMS Journal of Computing, 8:165–172.")]
+  [Item("TwoLevelExchangeManipulator", "The 2M operator which manipulates a Potvin VRP representation.  It is implemented as described in Potvin, J.-Y. and Bengio, S. (1996). The Vehicle Routing Problem with Time Windows - Part II: Genetic Search. INFORMS Journal of Computing, 8:165–172.")]
   [StorableClass]
-  public sealed class TwoLevelExchangeOperator : PotvinManipulator {
+  public sealed class TwoLevelExchangeManipulator : PotvinManipulator {
     [StorableConstructor]
-    private TwoLevelExchangeOperator(bool deserializing) : base(deserializing) { }
+    private TwoLevelExchangeManipulator(bool deserializing) : base(deserializing) { }
 
-    public TwoLevelExchangeOperator(): base() { }
+    public TwoLevelExchangeManipulator() : base() { }
     
     protected override void Manipulate(IRandom random, PotvinEncoding individual) {