Changeset 13349 for branches/Async/HeuristicLab.Optimization/3.3/Algorithms

Timestamp:

11/23/15 21:18:26 (9 years ago)

Author:

jkarder

Message:

#2258: added StartAsync to IExecutable

Location:

branches/Async/HeuristicLab.Optimization/3.3/Algorithms

Files:

• Algorithm.cs (modified) (2 diffs)
• BasicAlgorithm.cs (modified) (2 diffs)
• EngineAlgorithm.cs (modified) (2 diffs)

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

@@ -24 +24 @@
 using System.Drawing;
 using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
 using HeuristicLab.Collections;
 using HeuristicLab.Common;
@@ -202 +204 @@
       Prepare();
     }
-    public virtual void Start() {
+    public void Start() {
+      StartAsync().Wait();
+    }
+    public async Task StartAsync() {
+      await StartAsync(new CancellationToken());
+    }
+    public virtual async Task StartAsync(CancellationToken cancellationToken) {
       if ((ExecutionState != ExecutionState.Prepared) && (ExecutionState != ExecutionState.Paused))
         throw new InvalidOperationException(string.Format("Start not allowed in execution state \"{0}\".", ExecutionState));

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

@@ -61 +61 @@
     }
 
-    public override void Start() {
-      base.Start();
+    public override async Task StartAsync(CancellationToken cancellationToken) {
+      await base.StartAsync(cancellationToken);
       CancellationTokenSource = new CancellationTokenSource();
 
       OnStarted();
-      Task task = Task.Factory.StartNew(Run, cancellationTokenSource.Token, cancellationTokenSource.Token);
-      task.ContinueWith(t => {
-        try {
-          t.Wait();
-        } catch (AggregateException ex) {
+      using (var cts = CancellationTokenSource.CreateLinkedTokenSource(cancellationTokenSource.Token, cancellationToken)) {
+        Task task = Task.Factory.StartNew(Run, cts.Token, cts.Token);
+        await task.ContinueWith(t => {
           try {
-            ex.Flatten().Handle(x => x is OperationCanceledException);
-          } catch (AggregateException remaining) {
-            if (remaining.InnerExceptions.Count == 1) OnExceptionOccurred(remaining.InnerExceptions[0]);
-            else OnExceptionOccurred(remaining);
+            t.Wait();
           }
-        }
-        CancellationTokenSource.Dispose();
-        CancellationTokenSource = null;
-        OnStopped();
-      });
+          catch (AggregateException ex) {
+            try {
+              ex.Flatten().Handle(x => x is OperationCanceledException);
+            }
+            catch (AggregateException remaining) {
+              if (remaining.InnerExceptions.Count == 1) OnExceptionOccurred(remaining.InnerExceptions[0]);
+              else OnExceptionOccurred(remaining);
+            }
+          }
+          CancellationTokenSource.Dispose();
+          CancellationTokenSource = null;
+          OnStopped();
+        });
+      }
     }
 
@@ -106 +110 @@
       try {
         Run(cancellationToken);
-      } finally {
+      }
+      finally {
         timer.Elapsed -= new System.Timers.ElapsedEventHandler(timer_Elapsed);
         timer.Stop();

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

@@ -22 +22 @@
 using System;
 using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.PluginInfrastructure;
+using ExecutionContext = HeuristicLab.Core.ExecutionContext;
 
 namespace HeuristicLab.Optimization {
@@ -168 +171 @@
       }
     }
-    public override void Start() {
-      base.Start();
-      if (engine != null) engine.Start();
+    public override async Task StartAsync(CancellationToken cancellationToken) {
+      await base.StartAsync(cancellationToken);
+      if (engine != null) await engine.StartAsync(cancellationToken);
     }
     public override void Pause() {