Changeset 15066 for stable/HeuristicLab.Problems.VehicleRouting

Timestamp:

06/26/17 15:19:25 (7 years ago)

Author:

pfleck

Message:

#2705 merged r14478, r14481, r14482, r14504 to stable

Location:

stable

Files:

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

stable/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();
       }
 

stable/HeuristicLab.Problems.VehicleRouting/3.4/VehicleRoutingProblem.cs

@@ -198 +198 @@
         BestKnownQuality = new DoubleValue(ProblemInstance.Evaluate(BestKnownSolution.Solution).Quality);
         BestKnownSolution.Quality = BestKnownQuality;
-      } else {
-        BestKnownQuality = null;
       }
     }
@@ -208 +206 @@
 
     void ProblemInstance_EvaluationChanged(object sender, EventArgs e) {
+      BestKnownQuality = null;
       EvalBestKnownSolution();
     }