Changeset 13354 for branches/Async/HeuristicLab.Optimization/3.3/MetaOptimizers/Experiment.cs

Timestamp:

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

Author:

jkarder

Message:

#2258: improved cancellation support

File:

• branches/Async/HeuristicLab.Optimization/3.3/MetaOptimizers/Experiment.cs (modified) (3 diffs)

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();