Changeset 6771 for branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Zhu/Crossovers

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/Zhu/Crossovers

Files:

• ZhuHeuristicCrossover1.cs (modified) (1 diff)
• ZhuHeuristicCrossover2.cs (modified) (1 diff)
• ZhuMergeCrossover1.cs (modified) (1 diff)
• ZhuMergeCrossover2.cs (modified) (1 diff)
• ZhuPermutationCrossover.cs (modified) (1 diff)

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;