Changeset 4286 for branches

Timestamp:

08/23/10 13:41:26 (14 years ago)

Author:

svonolfe

Message:

Reverted r4284, fixed a minor issue with the alba encoding (#1039)

Location:

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba

Files:

• AlbaEncoding.cs (modified) (2 diffs)
• Manipulators/LambdaInterchangeManipulator.cs (modified) (1 diff)
• Moves/LambdaInterchange/StochasticLambdaInterchangeSingleMoveGenerator.cs (modified) (1 diff)

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/AlbaEncoding.cs

@@ -64 +64 @@
 
     public int MaxVehicles {
-      get { return Length - Cities;  }
+      get { return Length - Cities + 1;  }
     }
 
@@ -127 +127 @@
     public static AlbaEncoding ConvertFrom(List<int> routeParam) {
       List<int> route = new List<int>(routeParam);
+      route.RemoveAt(routeParam.Count - 1);
       
       int cities = 0;

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/Manipulators/LambdaInterchangeManipulator.cs

@@ -110 +110 @@
       Tour route2 = tours[route2Index];
 
-      int length1 = rand.Next(1, Math.Min(lambda + 1, route1.Cities.Count + 1));
+      int length1 = rand.Next(Math.Min(lambda + 1, route1.Cities.Count + 1));
       int index1 = rand.Next(route1.Cities.Count - length1 + 1);
 

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/Moves/LambdaInterchange/StochasticLambdaInterchangeSingleMoveGenerator.cs

@@ -65 +65 @@
       Tour route2 = tours[route2Index];
 
-      int length1 = rand.Next(1, Math.Min(lambda + 1, route1.Cities.Count + 1));
+      int length1 = rand.Next(Math.Min(lambda + 1, route1.Cities.Count + 1));
       int index1 = rand.Next(route1.Cities.Count - length1 + 1);