Changeset 14562 for branches/MemPRAlgorithm/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances

Timestamp:

01/13/17 12:55:06 (8 years ago)

Author:

abeham

Message:

#2701: Updated branch to trunk

Location:

branches/MemPRAlgorithm

Files:

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

branches/MemPRAlgorithm/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/VRPProblemInstance.cs

@@ -190 +190 @@
     public virtual double GetDistance(int start, int end, IVRPEncoding solution) {
       if (distanceMatrix == null && UseDistanceMatrix.Value) {
-        if (DistanceMatrix == null) DistanceMatrix = CreateDistanceMatrix();
-        distanceMatrix = DistanceMatrix;
+        distanceMatrix = DistanceMatrix ?? CreateDistanceMatrix();
       }