Changeset 13354

Timestamp:

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

Author:

jkarder

Message:

#2258: improved cancellation support

Location:

branches/Async

Files:

• HeuristicLab.Algorithms.Benchmarks/3.3/BenchmarkAlgorithm.cs (modified) (1 diff)
• HeuristicLab.Algorithms.DataAnalysis/3.4/CrossValidation.cs (modified) (3 diffs)
• HeuristicLab.Clients.OKB/3.3/RunCreation/OKBAlgorithm.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Executable.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Algorithms/Algorithm.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/MetaOptimizers/BatchRun.cs (modified) (3 diffs)
• HeuristicLab.Optimization/3.3/MetaOptimizers/Experiment.cs (modified) (3 diffs)
• HeuristicLab.Optimization/3.3/MetaOptimizers/TimeLimitRun.cs (modified) (1 diff)

branches/Async/HeuristicLab.Algorithms.Benchmarks/3.3/BenchmarkAlgorithm.cs

@@ -305 +305 @@
     }
     public async Task StartAsync() {
-      await StartAsync(new CancellationToken());
+      await StartAsync(CancellationToken.None);
     }
     public async Task StartAsync(CancellationToken cancellationToken) {

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) {

branches/Async/HeuristicLab.Clients.OKB/3.3/RunCreation/OKBAlgorithm.cs

@@ -255 +255 @@
     }
     public async Task StartAsync() {
-      await StartAsync(new CancellationToken());
+      await StartAsync(CancellationToken.None);
     }
     public async Task StartAsync(CancellationToken cancellationToken) {

branches/Async/HeuristicLab.Core/3.3/Executable.cs

@@ -88 +88 @@
     }
     public async Task StartAsync() {
-      await StartAsync(new CancellationToken());
+      await StartAsync(CancellationToken.None);
     }
     public virtual async Task StartAsync(CancellationToken cancellationToken) {

branches/Async/HeuristicLab.Optimization/3.3/Algorithms/Algorithm.cs

@@ -208 +208 @@
     }
     public async Task StartAsync() {
-      await StartAsync(new CancellationToken());
+      await StartAsync(CancellationToken.None);
     }
     public virtual async Task StartAsync(CancellationToken cancellationToken) {

branches/Async/HeuristicLab.Optimization/3.3/MetaOptimizers/BatchRun.cs

@@ -42 +42 @@
   public sealed class BatchRun : NamedItem, IOptimizer, IStorableContent {
     private readonly ManualResetEvent signaler = new ManualResetEvent(true);
+    private CancellationToken cancellationToken;
 
     public string Filename { get; set; }
@@ -251 +252 @@
     }
     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(async () => {
@@ -413 +415 @@
       else if (batchRunAction == BatchRunAction.Start) {
         Optimizer.Prepare();
-        Optimizer.StartAsync();
+        Optimizer.StartAsync(cancellationToken);
       } else if (executionState == ExecutionState.Started) {
         // if the batch run hasn't been started but the inner optimizer was run then pause

branches/Async/HeuristicLab.Optimization/3.3/MetaOptimizers/Experiment.cs

@@ -40 +40 @@
   public sealed class Experiment : NamedItem, IOptimizer, IStorableContent {
     private readonly ManualResetEvent signaler = new ManualResetEvent(true);
+    private CancellationToken cancellationToken;
 
     public string Filename { get; set; }
@@ -192 +193 @@
     }
     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(async () => {
@@ -395 +397 @@
         } else {
           if (experimentStarted && Optimizers.Any(x => (x.ExecutionState == ExecutionState.Prepared) || (x.ExecutionState == ExecutionState.Paused))) {
-            Optimizers.First(x => (x.ExecutionState == ExecutionState.Prepared) || (x.ExecutionState == ExecutionState.Paused)).StartAsync();
+            Optimizers.First(x => (x.ExecutionState == ExecutionState.Prepared) || (x.ExecutionState == ExecutionState.Paused)).StartAsync(cancellationToken);
           } else if (Optimizers.All(x => x.ExecutionState == ExecutionState.Stopped)) OnStopped();
           else if (Optimizers.Any(x => (x.ExecutionState == ExecutionState.Prepared) || (x.ExecutionState == ExecutionState.Paused)) && Optimizers.All(o => o.ExecutionState != ExecutionState.Started)) OnPaused();

branches/Async/HeuristicLab.Optimization/3.3/MetaOptimizers/TimeLimitRun.cs

@@ -244 +244 @@
     }
     public async Task StartAsync() {
-      await StartAsync(new CancellationToken());
+      await StartAsync(CancellationToken.None);
     }
     public async Task StartAsync(CancellationToken cancellationToken) {