Changeset 4174 for trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Evaluators/VRPEvaluator.cs

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/Evaluators/VRPEvaluator.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Evaluators/VRPEvaluator.cs

@@ -104 +104 @@
     }
 
-    private static TourEvaluation EvaluateTour(Tour tour, DoubleArray dueTimeArray,
+    internal static TourEvaluation EvaluateTour(Tour tour, DoubleArray dueTimeArray,
       DoubleArray serviceTimeArray, DoubleArray readyTimeArray, DoubleArray demandArray, DoubleValue capacity,
       DoubleValue fleetUsageFactor, DoubleValue timeFactor, DoubleValue distanceFactor, DoubleValue overloadPenalty, DoubleValue tardinessPenalty,
@@ -122 +122 @@
 
       //simulate a tour, start and end at depot
-      for (int i = 0; i <= tour.Count; i++) {
+      for (int i = 0; i <= tour.Cities.Count; i++) {
         int start = 0;
         if(i > 0)
-          start = tour[i - 1].Value;
+          start = tour.Cities[i - 1];
         int end = 0;
-        if(i < tour.Count)
-          end = tour[i].Value;
+        if (i < tour.Cities.Count)
+          end = tour.Cities[i];
 
         //drive there