Changeset 15219 for stable/HeuristicLab.Problems.VehicleRouting/3.4/VehicleRoutingProblem.cs

Timestamp:

07/12/17 21:07:36 (7 years ago)

Author:

abeham

Message:

#2696, #2790: merged revisions 15072, 15083, 15168 to stable

Location:

stable

Files:

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

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

@@ -194 +194 @@
 
     private void EvalBestKnownSolution() {
-      if (BestKnownSolution != null) {
+      if (BestKnownSolution == null) return;
+      try {
         //call evaluator
         BestKnownQuality = new DoubleValue(ProblemInstance.Evaluate(BestKnownSolution.Solution).Quality);
         BestKnownSolution.Quality = BestKnownQuality;
+      } catch {
+        BestKnownQuality = null;
+        BestKnownSolution = null;
       }
     }
@@ -207 +211 @@
     void ProblemInstance_EvaluationChanged(object sender, EventArgs e) {
       BestKnownQuality = null;
-      EvalBestKnownSolution();
+      if (BestKnownSolution != null) {
+        // the tour is not valid if there are more vehicles in it than allowed
+        if (ProblemInstance.Vehicles.Value < BestKnownSolution.Solution.GetTours().Count) {
+          BestKnownSolution = null;
+        } else EvalBestKnownSolution();
+      }
     }