Changeset 8346 for trunk/sources/HeuristicLab.Problems.VehicleRouting/3.4/Encodings

Timestamp:

07/27/12 15:21:20 (12 years ago)

Author:

jkarder

Message:

#1331:

• added operators for the VehicleRouting problem
• minor code improvements

Location:

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

Files:

• PotvinCrossover.cs (modified) (1 diff)
• PotvinRouteBasedCrossover.cs (modified) (4 diffs)
• PotvinSequenceBasedCrossover.cs (modified) (4 diffs)

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

@@ -63 +63 @@
     }
 
-    protected Tour FindRoute(PotvinEncoding solution, int city) {
+    protected static Tour FindRoute(PotvinEncoding solution, int city) {
       Tour found = null;
 

trunk/sources/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Crossovers/PotvinRouteBasedCrossover.cs

@@ -24 +24 @@
 using HeuristicLab.Encodings.PermutationEncoding;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Problems.VehicleRouting.Interfaces;
 
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
@@ -43 +44 @@
     }
 
-    protected override PotvinEncoding Crossover(IRandom random, PotvinEncoding parent1, PotvinEncoding parent2) {
-      bool allowInfeasible = AllowInfeasibleSolutions.Value.Value;
-
+    public static PotvinEncoding Apply(IRandom random, PotvinEncoding parent1, PotvinEncoding parent2, IVRPProblemInstance problemInstance, bool allowInfeasible) {
       PotvinEncoding child = parent2.Clone() as PotvinEncoding;
 
@@ -75 +74 @@
             child.Unrouted.Add(city);
 
-        if (Repair(random, child, replacing, ProblemInstance, allowInfeasible) || allowInfeasible)
+        if (Repair(random, child, replacing, problemInstance, allowInfeasible) || allowInfeasible)
           return child;
         else {
@@ -87 +86 @@
       }
     }
+
+    protected override PotvinEncoding Crossover(IRandom random, PotvinEncoding parent1, PotvinEncoding parent2) {
+      return Apply(random, parent1, parent2, ProblemInstance, AllowInfeasibleSolutions.Value.Value);
+    }
   }
 }

trunk/sources/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Crossovers/PotvinSequenceBasedCrossover.cs

@@ -23 +23 @@
 using HeuristicLab.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Problems.VehicleRouting.Interfaces;
 
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
@@ -42 +43 @@
     }
 
-    protected override PotvinEncoding Crossover(IRandom random, PotvinEncoding parent1, PotvinEncoding parent2) {
-      bool allowInfeasible = AllowInfeasibleSolutions.Value.Value;
-
+    public static PotvinEncoding Apply(IRandom random, PotvinEncoding parent1, PotvinEncoding parent2, IVRPProblemInstance problemInstance, bool allowInfeasible) {
       PotvinEncoding child = parent1.Clone() as PotvinEncoding;
       Tour newTour = new Tour();
 
-      int cities = ProblemInstance.Cities.Value;
+      int cities = problemInstance.Cities.Value;
 
       if (cities > 0) {
@@ -77 +76 @@
             child.Unrouted.Add(city);
 
-        if (Repair(random, child, newTour, ProblemInstance, allowInfeasible) || allowInfeasible) {
+        if (Repair(random, child, newTour, problemInstance, allowInfeasible) || allowInfeasible) {
           return child;
         } else {
@@ -89 +88 @@
       }
     }
+
+    protected override PotvinEncoding Crossover(IRandom random, PotvinEncoding parent1, PotvinEncoding parent2) {
+      return Apply(random, parent1, parent2, ProblemInstance, AllowInfeasibleSolutions.Value.Value);
+    }
   }
 }