Changeset 7543 for branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba

Timestamp:

03/05/12 10:15:50 (12 years ago)

Author:

svonolfe

Message:

Fixed minor issues (#1177)

Location:

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

Files:

• AlbaEncoding.cs (modified) (1 diff)
• Creators/RandomCreator.cs (modified) (1 diff)

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

@@ -126 +126 @@
       int cities = instance.Cities.Value;
 
-      int vehicle = cities;
       for (int i = 0; i < route.Count; i++) {
-        if (route[i] == 0) {
-          route[i] = vehicle;
-          vehicle++;
+        if (route[i] <= 0) {
+          int vehicle = -route[i];
+          route[i] = cities + vehicle;
         } else {
           route[i] = route[i] - 1;

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Creators/RandomCreator.cs

@@ -65 +65 @@
         perm[i] = i + 1;
       for (int i = cities; i < cities + vehicles; i++)
-        perm[i] = 0;
+        perm[i] = -(i - cities);
       for (int i = 0; i < perm.Length - 2; i++) {
         sortingArray[i] = RandomParameter.ActualValue.Next(perm.Length * 2);