Changeset 15384

Timestamp:

09/28/17 08:04:05 (7 years ago)

Author:

jkarder

Message:

#2830: merged r15367 into stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Algorithms.Benchmarks/3.3/BenchmarkAlgorithm.cs (modified) (1 diff)
• HeuristicLab.Algorithms.DataAnalysis (modified) (1 prop)
• HeuristicLab.Algorithms.DataAnalysis.Views (modified) (1 prop)
• HeuristicLab.Algorithms.DataAnalysis.Views/3.4/CrossValidationView.cs (modified) (1 diff)
• HeuristicLab.Algorithms.DataAnalysis/3.4/CrossValidation.cs (modified) (3 diffs)
• HeuristicLab.Clients.Hive/3.3/Tasks/EngineTask.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive/3.3/Tasks/OptimizerTask.cs (modified) (1 diff)
• HeuristicLab.Clients.OKB.Views/3.3/RunCreation/Views/OKBAlgorithmView.cs (modified) (1 diff)
• HeuristicLab.Common/3.3/AsyncHelper.cs (modified) (2 diffs)
• HeuristicLab.Common/3.3/ExceptionExtensions.cs (copied) (copied from trunk/sources/HeuristicLab.Common/3.3/ExceptionExtensions.cs)
• HeuristicLab.Common/3.3/HeuristicLab.Common-3.3.csproj (modified) (1 diff)
• HeuristicLab.Core (modified) (1 prop)
• HeuristicLab.Core/3.3/Engine.cs (modified) (2 diffs)
• HeuristicLab.DebugEngine/3.3/DebugEngine.cs (modified) (1 diff)
• HeuristicLab.Optimization (modified) (1 prop)
• HeuristicLab.Optimization.Views (modified) (1 prop)
• HeuristicLab.Optimization.Views/3.3/IOptimizerView.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Algorithms/BasicAlgorithm.cs (modified) (1 diff)

stable/HeuristicLab.Algorithms.Benchmarks/3.3/BenchmarkAlgorithm.cs

@@ -312 +312 @@
       } catch (OperationCanceledException) {
       } catch (AggregateException ae) {
-        OnExceptionOccurred(ae.InnerExceptions.SingleOrDefault() ?? ae);
+        ae.FlattenAndHandle(new[] { typeof(OperationCanceledException) }, e => OnExceptionOccurred(e));
       } catch (Exception e) {
         OnExceptionOccurred(e);

stable/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/CrossValidationView.cs

@@ -222 +222 @@
     }
 
-    private void startButton_Click(object sender, EventArgs e) {
-      Content.StartAsync();
+    private async void startButton_Click(object sender, EventArgs e) {
+      await Content.StartAsync();
     }
     private void pauseButton_Click(object sender, EventArgs e) {

stable/HeuristicLab.Algorithms.DataAnalysis/3.4/CrossValidation.cs

@@ -352 +352 @@
       allAlgorithmsFinished = new ManualResetEventSlim(false);
 
+      var startedTasks = new List<Task>(clonedAlgorithms.Count);
+
       //start prepared or paused cloned algorithms
       foreach (IAlgorithm clonedAlgorithm in clonedAlgorithms) {
@@ -360 +362 @@
           lock (locker) {
             if (pausePending || stopPending || ExecutionState != ExecutionState.Started) break;
-            clonedAlgorithm.StartAsync(cancellationToken);
+            var task = clonedAlgorithm.StartAsync(cancellationToken);
+            startedTasks.Add(task);
           }
         }
@@ -366 +369 @@
 
       allAlgorithmsFinished.Wait();
+
+      Task.WaitAll(startedTasks.ToArray()); // to get exceptions not handled within the tasks
     }
 

stable/HeuristicLab.Clients.Hive/3.3/Tasks/EngineTask.cs

@@ -79 +79 @@
     public override void Prepare() { }
 
-    public override void Start() {
+    public override async void Start() {
       Item.Prepare(initialOperation);
-      Item.StartAsync();
+      await Item.StartAsync();
     }
 

stable/HeuristicLab.Clients.Hive/3.3/Tasks/OptimizerTask.cs

@@ -96 +96 @@
     }
 
-    public override void Start() {
+    public override async void Start() {
       if ((Item is Experiment && OptimizerAsExperiment.Optimizers.Count == 0) || // experiment would not fire OnStopped if it has 0 optimizers
           (Item is BatchRun && OptimizerAsBatchRun.Optimizer == null)) { // batchrun would not fire OnStopped if algorithm == null
         OnTaskStopped();
       } else {
-        Item.StartAsync();
+        await Item.StartAsync();
       }
     }

stable/HeuristicLab.Clients.OKB.Views/3.3/RunCreation/Views/OKBAlgorithmView.cs

@@ -324 +324 @@
       if (Content != null) Content.StoreAlgorithmInEachRun = storeAlgorithmInEachRunCheckBox.Checked;
     }
-    private void startButton_Click(object sender, EventArgs e) {
-      Content.StartAsync();
+    private async void startButton_Click(object sender, EventArgs e) {
+      await Content.StartAsync();
     }
     private void pauseButton_Click(object sender, EventArgs e) {

stable/HeuristicLab.Common/3.3/AsyncHelper.cs

@@ -21 +21 @@
 
 using System;
-using System.Linq;
 using System.Runtime.ExceptionServices;
 using System.Threading;
@@ -38 +37 @@
       } catch (OperationCanceledException) {
       } catch (AggregateException ae) {
-        var e = ae.InnerExceptions.SingleOrDefault() ?? ae;
-        ExceptionDispatchInfo.Capture(e).Throw();
+        ae.FlattenAndHandle(new[] { typeof(OperationCanceledException) }, e => ExceptionDispatchInfo.Capture(e).Throw());
       }
     }

stable/HeuristicLab.Common/3.3/HeuristicLab.Common-3.3.csproj

@@ -132 +132 @@
     <Compile Include="Constants.cs" />
     <Compile Include="ArrayExtensions.cs" />
+    <Compile Include="ExceptionExtensions.cs" />
     <Compile Include="Statistics\EmpiricalCumulativeDistributionFunction.cs" />
     <Compile Include="ListExtensions.cs" />

stable/HeuristicLab.Core/3.3/Engine.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Threading;
 using HeuristicLab.Common;
@@ -91 +90 @@
       } catch (OperationCanceledException) {
       } catch (AggregateException ae) {
-        OnExceptionOccurred(ae.InnerExceptions.SingleOrDefault() ?? ae);
+        ae.FlattenAndHandle(new[] { typeof(OperationCanceledException) }, e => OnExceptionOccurred(e));
       } catch (Exception e) {
         OnExceptionOccurred(e);

stable/HeuristicLab.DebugEngine/3.3/DebugEngine.cs

@@ -181 +181 @@
       } catch (OperationCanceledException) {
       } catch (AggregateException ae) {
-        OnExceptionOccurred(ae.InnerExceptions.SingleOrDefault() ?? ae);
+        ae.FlattenAndHandle(new[] { typeof(OperationCanceledException) }, e => OnExceptionOccurred(e));
       } catch (Exception e) {
         OnExceptionOccurred(e);

stable/HeuristicLab.Optimization.Views/3.3/IOptimizerView.cs

@@ -136 +136 @@
 
     #region Control events
-    protected virtual void startButton_Click(object sender, EventArgs e) {
-      Content.StartAsync();
+    protected virtual async void startButton_Click(object sender, EventArgs e) {
+      await Content.StartAsync();
     }
     protected virtual void pauseButton_Click(object sender, EventArgs e) {

stable/HeuristicLab.Optimization/3.3/Algorithms/BasicAlgorithm.cs

@@ -84 +84 @@
       }
       catch (AggregateException ae) {
-        OnExceptionOccurred(ae.InnerExceptions.SingleOrDefault() ?? ae);
+        ae.FlattenAndHandle(new[] { typeof(OperationCanceledException) }, e => OnExceptionOccurred(e));
       }
       catch (Exception e) {