Changeset 4174 for trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba

Timestamp:

08/06/10 16:08:46 (14 years ago)

Author:

svonolfe

Message:

Refactored VRP, added some Potvin operators (WIP) (#1039)

File:

• trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/AlbaEncoding.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/AlbaEncoding.cs

@@ -42 +42 @@
         for (int i = 0; i < this.array.Length; i++) {
           if (this.array[i] >= cities) {
-            if (tour.Count > 0) {
+            if (tour.Cities.Count > 0) {
               result.Add(tour);
 
@@ -48 +48 @@
             }
           } else {
-            tour.Add(new IntValue(this.array[i] + 1));
+            tour.Cities.Add(this.array[i] + 1);
           }
         }
 
-        if (tour.Count > 0) {
+        if (tour.Cities.Count > 0) {
           result.Add(tour);
         }
@@ -97 +97 @@
       int cities = 0;
       foreach (Tour tour in tours) {
-        cities += tour.Count;
+        cities += tour.Cities.Count;
       }
 
@@ -107 +107 @@
 
       foreach (Tour tour in tours) {
-        foreach (IntValue city in tour) {
-            array[arrayIndex] = city.Value - 1;
+        foreach (int city in tour.Cities) {
+            array[arrayIndex] = city - 1;
             arrayIndex++;
         }