Changeset 8922

Timestamp:

11/19/12 16:29:34 (12 years ago)

Author:

mkommend

Message:

#1953: Refactored GetDistance method in VRPProblemInstace.

File:

• trunk/sources/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/VRPProblemInstance.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/VRPProblemInstance.cs

@@ -183 +183 @@
 
     public virtual double GetDistance(int start, int end, IVRPEncoding solution) {
-      double distance = 0.0;
       if (distanceMatrix == null && UseDistanceMatrix.Value) {
-        if (DistanceMatrix != null)
-          distanceMatrix = DistanceMatrix;
-        else
-          distanceMatrix = DistanceMatrix = CreateDistanceMatrix();
-      }
-
-      if (distanceMatrix != null)
-        distance = distanceMatrix[start, end];
-      else
-        distance = CalculateDistance(start, end);
-
-      return distance;
+        if (DistanceMatrix == null) DistanceMatrix = CreateDistanceMatrix();
+        distanceMatrix = DistanceMatrix;
+      }
+
+      if (distanceMatrix != null) return distanceMatrix[start, end];
+      return CalculateDistance(start, end);
     }