Changeset 6771 for branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4

Timestamp:

09/15/11 16:26:41 (13 years ago)

Author:

svonolfe

Message:

Corrected behavior of various operators when a solution contains more tours than vehicles (#1177)

Location:

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

Files:

• Potvin/PotvinEncoding.cs (modified) (2 diffs)
• Prins/Crossovers/PrinsPermutationCrossover.cs (modified) (1 diff)
• Zhu/Crossovers/ZhuHeuristicCrossover1.cs (modified) (1 diff)
• Zhu/Crossovers/ZhuHeuristicCrossover2.cs (modified) (1 diff)
• Zhu/Crossovers/ZhuMergeCrossover1.cs (modified) (1 diff)
• Zhu/Crossovers/ZhuMergeCrossover2.cs (modified) (1 diff)
• Zhu/Crossovers/ZhuPermutationCrossover.cs (modified) (1 diff)

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/PotvinEncoding.cs

@@ -78 +78 @@
     }
 
-    public int FindBestInsertionPlace(Tour tour, int city) {
+    public int FindBestInsertionPlace(Tour tour, int city, int positionToAvoid = -1) {
       int place = -1;
       double minQuality = -1;
@@ -85 +85 @@
 
       for (int i = 0; i <= tour.Stops.Count; i++) {
-        bool feasible;
-        double quality = ProblemInstance.GetInsertionCosts(eval, city, 0, i, out feasible);
-        if (place < 0 || quality < minQuality) {
-          place = i;
-          minQuality = quality;
+        if (positionToAvoid != i) {
+          bool feasible;
+          double quality = ProblemInstance.GetInsertionCosts(eval, city, 0, i, out feasible);
+          if (place < 0 || quality < minQuality) {
+            place = i;
+            minQuality = quality;
+          }
         }
       }

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Prins/Crossovers/PrinsPermutationCrossover.cs

@@ -52 +52 @@
 
     protected override PrinsEncoding Crossover(IRandom random, PrinsEncoding parent1, PrinsEncoding parent2) {
+      if (parent1.Length != parent2.Length)
+        return parent1.Clone() as PrinsEncoding;
+
       //note - the inner crossover is called here and the result is converted to a prins representation
       //some refactoring should be done here in the future - the crossover operation should be called directly

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Zhu/Crossovers/ZhuHeuristicCrossover1.cs

@@ -61 +61 @@
       ZhuEncoding child = parent2.Clone() as ZhuEncoding;
 
+      if (parent1.Length != parent2.Length)
+        return child;
+
       int breakPoint = random.Next(child.Length);
       int i = breakPoint;

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Zhu/Crossovers/ZhuHeuristicCrossover2.cs

@@ -53 +53 @@
       ZhuEncoding child = parent2.Clone() as ZhuEncoding;
 
+      if (parent1.Length != parent2.Length)
+        return child;
+
       int breakPoint = random.Next(child.Length);
       int i = breakPoint;

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Zhu/Crossovers/ZhuMergeCrossover1.cs

@@ -62 +62 @@
       ZhuEncoding child = parent2.Clone() as ZhuEncoding;
 
+      if (parent1.Length != parent2.Length)
+        return child;
+
       int breakPoint = random.Next(child.Length);
       int i = breakPoint;

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Zhu/Crossovers/ZhuMergeCrossover2.cs

@@ -54 +54 @@
       ZhuEncoding child = parent2.Clone() as ZhuEncoding;
 
+      if (parent1.Length != parent2.Length)
+        return child;
+
       int breakPoint = random.Next(child.Length);
       int i = breakPoint;

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Zhu/Crossovers/ZhuPermutationCrossover.cs

@@ -54 +54 @@
       //note - the inner crossover is called here and the result is converted to a prins representation
       //some refactoring should be done here in the future - the crossover operation should be called directly
+      if (parent1.Length != parent2.Length)
+        return parent1.Clone() as ZhuEncoding;
 
       InnerCrossoverParameter.ActualValue.ParentsParameter.ActualName = ParentsParameter.ActualName;