Changeset 15292 for stable/HeuristicLab.Clients.OKB/3.3

Timestamp:

07/28/17 16:47:42 (7 years ago)

Author:

jkarder

Message:

#2258: merged r15287 into stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Clients.OKB/3.3/RunCreation/OKBAlgorithm.cs (modified) (3 diffs)

stable/HeuristicLab.Clients.OKB/3.3/RunCreation/OKBAlgorithm.cs

@@ -20 +20 @@
 #endregion
 
+using System.Threading;
+using System.Threading.Tasks;
 using HeuristicLab.Clients.Access;
 using HeuristicLab.Collections;
@@ -67 +69 @@
             try {
               algorithm.Problem = problem;
-            }
-            catch (ArgumentException) {
+            } catch (ArgumentException) {
               algorithm.Problem = null;
             }
@@ -250 +251 @@
     }
     public void Start() {
+      Start(CancellationToken.None);
+    }
+    public void Start(CancellationToken cancellationToken) {
       CheckUserPermissions();
       if (!ClientInformation.Instance.ClientExists && storeRunsAutomatically) {
         throw new MissingClientRegistrationException();
       }
-      Algorithm.Start();
+      Algorithm.Start(cancellationToken);
+    }
+    public async Task StartAsync() { await StartAsync(CancellationToken.None); }
+    public async Task StartAsync(CancellationToken cancellationToken) {
+      await AsyncHelper.DoAsync(Start, cancellationToken);
     }
     public void Pause() {