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

Timestamp:

06/20/11 13:36:49 (13 years ago)

Author:

svonolfe

Message:

Improved performance of many VRP operators by optimizing the parameter lookup (#1561)

File:

• trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/VRPUtilities.cs (modified) (2 diffs)

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

@@ -25 +25 @@
 
 namespace HeuristicLab.Problems.VehicleRouting {
+  public struct DistanceMatrix {
+    public DoubleMatrix Matrix { get; set; }
+    public BoolValue UseDistanceMatrix { get; set; }
+  }
+
   public sealed class VRPUtilities {
     public static double CalculateDistance(int start, int end, DoubleMatrix coordinates) {
@@ -50 +55 @@
 
       return distanceMatrix;
+    }
+
+    public static DistanceMatrix GetDistanceMatrix(DoubleMatrix coordinates, IParameter distanceMatrix, BoolValue useDistanceMatrix) {
+      DistanceMatrix result = new DistanceMatrix();
+      
+      if (useDistanceMatrix.Value) {
+        result.UseDistanceMatrix = new BoolValue(true);
+        if (distanceMatrix is IValueParameter<DoubleMatrix>) {
+          if ((distanceMatrix as IValueParameter<DoubleMatrix>).Value == null) {
+            (distanceMatrix as IValueParameter<DoubleMatrix>).Value = CreateDistanceMatrix(coordinates);
+          }
+
+          result.Matrix = (distanceMatrix as IValueParameter<DoubleMatrix>).Value;
+        } else {
+          if (distanceMatrix.ActualValue == null) {
+            distanceMatrix.ActualValue = CreateDistanceMatrix(coordinates);
+          }
+
+          result.Matrix = (distanceMatrix.ActualValue as DoubleMatrix);
+        }
+      } else {
+        result.UseDistanceMatrix = new BoolValue(false);
+        result.Matrix = coordinates;
+      }
+
+      return result;
+    }
+
+    public static double GetDistance(int start, int end, DistanceMatrix distMatrix) {
+      double distance = 0.0;
+
+      if (distMatrix.UseDistanceMatrix.Value)
+        distance = distMatrix.Matrix[start, end];
+      else
+        distance = CalculateDistance(start, end, distMatrix.Matrix);
+
+      return distance;
     }