Changeset 6618 for branches/GP.Grammar.Editor/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Tour.cs

Timestamp:

08/01/11 17:48:53 (13 years ago)

Author:

mkommend

Message:

#1479: Integrated trunk changes.

File:

• branches/GP.Grammar.Editor/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Tour.cs (modified) (3 diffs)

branches/GP.Grammar.Editor/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Tour.cs

@@ -48 +48 @@
     public bool Feasible(DoubleArray dueTimeArray,
       DoubleArray serviceTimeArray, DoubleArray readyTimeArray, DoubleArray demandArray, DoubleValue capacity,
-      DoubleMatrix coordinates, ILookupParameter<DoubleMatrix> distanceMatrix, BoolValue useDistanceMatrix) {
+      DistanceMatrix distMatrix) {
       TourEvaluation eval = VRPEvaluator.EvaluateTour(this,
         dueTimeArray,
@@ -60 +60 @@
         new DoubleValue(1),
         new DoubleValue(1),
-        coordinates,
-        distanceMatrix,
-        useDistanceMatrix);
+        distMatrix);
 
       return eval.Overload < double.Epsilon && eval.Tardiness < double.Epsilon;
     }
 
-    public double GetLength(DoubleMatrix coordinates,
-      ILookupParameter<DoubleMatrix> distanceMatrix,
-      BoolValue useDistanceMatrix) {
+    public double GetLength(DistanceMatrix distMatrix) {
       double length = 0;
 
@@ -82 +78 @@
         for (int i = 1; i < cities.Count; i++) {
           length += VRPUtilities.GetDistance(
-            cities[i - 1], cities[i], coordinates, distanceMatrix, useDistanceMatrix);
+            cities[i - 1], cities[i], distMatrix);
         }
       }