Changeset 4352 for trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/VRPUtilities.cs

Timestamp:

09/01/10 11:13:46 (14 years ago)

Author:

svonolfe

Message:

Merged r4351 of the VRP feature branch into trunk (#1039)

Location:

trunk/sources/HeuristicLab.Problems.VehicleRouting

Files:

• . (modified) (1 prop)
• 3.3/VRPUtilities.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/VRPUtilities.cs

@@ -60 +60 @@
 
       if (useDistanceMatrix.Value) {
-        if (distanceMatrix.ActualValue == null) {
-          distanceMatrix.ActualValue = CreateDistanceMatrix(coordinates);
-        }
+        if (distanceMatrix is IValueLookupParameter<DoubleMatrix> &&
+          (distanceMatrix as IValueLookupParameter<DoubleMatrix>).Value != null) {
+            distance = (distanceMatrix as IValueLookupParameter<DoubleMatrix>).Value[start, end];
+        } else {
+          if (distanceMatrix.ActualValue == null) {
+            distanceMatrix.ActualValue = CreateDistanceMatrix(coordinates);
+          }
 
-        distance = distanceMatrix.ActualValue[start, end];
+          distance = distanceMatrix.ActualValue[start, end];
+        }       
       } else {
         distance = CalculateDistance(start, end, coordinates);