Changeset 6851 for branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Tour.cs

Timestamp:

09/29/11 15:51:56 (13 years ago)

Author:

svonolfe

Message:

Added support for multi depot CVRP instances (#1177)

File:

• branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Tour.cs (modified) (3 diffs)

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

@@ -48 +48 @@
     }
 
-    public double GetTourLength(IVRPProblemInstance instance) {
+    public double GetTourLength(IVRPProblemInstance instance, IVRPEncoding solution) {
       double length = 0;
 
@@ -60 +60 @@
 
         for (int i = 1; i < cities.Count; i++) {
-          length += instance.GetDistance(cities[i - 1], cities[i]);
+          length += instance.GetDistance(cities[i - 1], cities[i], solution);
         }
       }
@@ -66 +66 @@
       return length;
     }
+
+    public bool IsEqual(Tour tour) {
+      bool equal = (tour != null) && (tour.Stops.Count == Stops.Count);
+      int index = 0;
+
+      while (equal && index < Stops.Count) {
+        equal = equal && tour.Stops[index] == Stops[index];
+        index++;
+      }      
+
+      return equal;
+    }
   }
 }