Changeset 13354 for branches/Async/HeuristicLab.Algorithms.DataAnalysis/3.4

Timestamp:

11/24/15 12:20:43 (9 years ago)

Author:

jkarder

Message:

#2258: improved cancellation support

File:

• branches/Async/HeuristicLab.Algorithms.DataAnalysis/3.4/CrossValidation.cs (modified) (3 diffs)

branches/Async/HeuristicLab.Algorithms.DataAnalysis/3.4/CrossValidation.cs

@@ -41 +41 @@
   public sealed class CrossValidation : ParameterizedNamedItem, IAlgorithm, IStorableContent {
     private readonly ManualResetEvent signaler = new ManualResetEvent(true);
+    private CancellationToken cancellationToken;
 
     public CrossValidation()
@@ -272 +273 @@
     }
     public async Task StartAsync() {
-      await StartAsync(new CancellationToken());
+      await StartAsync(CancellationToken.None);
     }
     public async Task StartAsync(CancellationToken cancellationToken) {
+      this.cancellationToken = cancellationToken;
       signaler.Reset();
       await Task.Run(() => {
@@ -682 +684 @@
           IAlgorithm preparedAlgorithm = clonedAlgorithms.FirstOrDefault(alg => alg.ExecutionState == ExecutionState.Prepared ||
                                                                                 alg.ExecutionState == ExecutionState.Paused);
-          if (preparedAlgorithm != null) preparedAlgorithm.StartAsync();
+          if (preparedAlgorithm != null) preparedAlgorithm.StartAsync(cancellationToken);
         }
         if (ExecutionState != ExecutionState.Stopped) {