Changeset 15232 for branches/Async/HeuristicLab.Algorithms.DataAnalysis/3.4

Timestamp:

07/13/17 15:53:56 (7 years ago)

Author:

jkarder

Message:

#2258: worked on exception handling

Location:

branches/Async/HeuristicLab.Algorithms.DataAnalysis/3.4

Files:

• CrossValidation.cs (modified) (1 diff)
• FixedDataAnalysisAlgorithm.cs (modified) (2 diffs)

branches/Async/HeuristicLab.Algorithms.DataAnalysis/3.4/CrossValidation.cs

@@ -344 +344 @@
     public async Task StartAsync() { await StartAsync(CancellationToken.None); }
     public async Task StartAsync(CancellationToken cancellationToken) {
-      await Task.Factory.StartNew((ct) => Start((CancellationToken)ct), cancellationToken, cancellationToken);
+      await AsyncHelper.DoAsync(Start, cancellationToken);
     }
 

branches/Async/HeuristicLab.Algorithms.DataAnalysis/3.4/FixedDataAnalysisAlgorithm.cs

@@ -21 +21 @@
 
 using System;
+using System.Linq;
 using System.Threading;
 using HeuristicLab.Common;
@@ -77 +78 @@
       } catch (OperationCanceledException) {
       } catch (AggregateException ae) {
-        if (ae.InnerExceptions.Count == 1) OnExceptionOccurred(ae.InnerExceptions[0]);
-        else OnExceptionOccurred(ae);
+        OnExceptionOccurred(ae.InnerExceptions.SingleOrDefault() ?? ae);
       } catch (Exception e) {
         OnExceptionOccurred(e);