Changeset 17320 for branches/2521_ProblemRefactoring/HeuristicLab.Problems.PTSP

Timestamp:

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

Author:

mkommend

Message:

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

Location:

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

Files:

• AnalyticalPTSP.cs (modified) (2 diffs)
• EstimatedPTSP.cs (modified) (3 diffs)
• Moves/OneShift/PTSPAnalyticalInsertionMoveEvaluator.cs (modified) (2 diffs)
• Moves/TwoOpt/PTSPAnalyticalInversionMoveEvaluator.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;

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

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
 using HEAL.Attic;
 using HeuristicLab.Common;
@@ -101 +102 @@
     }
 
-    public override double Evaluate(Permutation tour, IRandom random) {
-      return Evaluate(tour, ProbabilisticTSPData, RealizationData);
+    public override double Evaluate(Permutation tour, IRandom random, CancellationToken cancellationToken) {
+      return Evaluate(tour, ProbabilisticTSPData, RealizationData, cancellationToken);
     }
 
@@ -110 +111 @@
     }
 
-    public static double Evaluate(Permutation tour, IProbabilisticTSPData data, IEnumerable<BoolArray> realizations) {
+    public static double Evaluate(Permutation tour, IProbabilisticTSPData data, IEnumerable<BoolArray> realizations, CancellationToken cancellationToken) {
       // Estimation-based evaluation, here without calculating variance for faster evaluation
       var estimatedSum = 0.0;

branches/2521_ProblemRefactoring/HeuristicLab.Problems.PTSP/3.3/Moves/OneShift/PTSPAnalyticalInsertionMoveEvaluator.cs

@@ -20 +20 @@
 #endregion
 
+using System.Threading;
 using HEAL.Attic;
 using HeuristicLab.Common;
@@ -50 +51 @@
       var afterMove = (Permutation)tour.Clone();
       TranslocationManipulator.Apply(afterMove, move.Index1, move.Index1, move.Index3);
-      return AnalyticalPTSP.Evaluate(afterMove, data);
+      return AnalyticalPTSP.Evaluate(afterMove, data, CancellationToken.None);
     }
 

branches/2521_ProblemRefactoring/HeuristicLab.Problems.PTSP/3.3/Moves/TwoOpt/PTSPAnalyticalInversionMoveEvaluator.cs

@@ -20 +20 @@
 #endregion
 
+using System.Threading;
 using HEAL.Attic;
 using HeuristicLab.Common;
@@ -50 +51 @@
       var afterMove = (Permutation)tour.Clone();
       InversionManipulator.Apply(afterMove, move.Index1, move.Index2);
-      return AnalyticalPTSP.Evaluate(afterMove, data);
+      return AnalyticalPTSP.Evaluate(afterMove, data, CancellationToken.None);
     }