Changeset 17320 for branches/2521_ProblemRefactoring/HeuristicLab.Problems.PTSP/3.3/AnalyticalPTSP.cs

Timestamp:

10/04/19 17:31:54 (5 years ago)

Author:

mkommend

Message:

#2521: Added cancellation token to evaluate function of problems.

File:

• branches/2521_ProblemRefactoring/HeuristicLab.Problems.PTSP/3.3/AnalyticalPTSP.cs (modified) (2 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Problems.PTSP/3.3/AnalyticalPTSP.cs

@@ -20 +20 @@
 #endregion
 
+using System.Threading;
 using HEAL.Attic;
 using HeuristicLab.Common;
@@ -59 +60 @@
     }
 
-    public override double Evaluate(Permutation tour, IRandom random) {
-      return Evaluate(tour, ProbabilisticTSPData);
+    public override double Evaluate(Permutation tour, IRandom random, CancellationToken cancellationToken) {
+      return Evaluate(tour, ProbabilisticTSPData, cancellationToken);
     }
 
-    public static double Evaluate(Permutation tour, IProbabilisticTSPData data) {
+    public static double Evaluate(Permutation tour, IProbabilisticTSPData data, CancellationToken cancellationToken) {
       // Analytical evaluation
       var firstSum = 0.0;