Changeset 15797 for trunk/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression

Timestamp:

02/21/18 12:28:30 (7 years ago)

Author:

fholzing

Message:

#2871: Rebuild from BackgroundWorker to async await

File:

• trunk/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionVariableImpactsView.cs (modified) (7 diffs)

trunk/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionVariableImpactsView.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
 using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
 using HeuristicLab.Common;
 using HeuristicLab.Data;
@@ -32 +33 @@
   [Content(typeof(IRegressionSolution))]
   public partial class RegressionSolutionVariableImpactsView : DataAnalysisSolutionEvaluationView {
-    private class BackgroundworkerArguments {
-      internal MainForm.WindowsForms.MainForm mainForm;
-      internal RegressionSolutionVariableImpactsCalculator.ReplacementMethodEnum replMethod;
-      internal RegressionSolutionVariableImpactsCalculator.FactorReplacementMethodEnum factorReplMethod;
-      internal RegressionSolutionVariableImpactsCalculator.DataPartitionEnum dataPartition;
-    }
+    private CancellationTokenSource cancellationToken = new CancellationTokenSource();
     private enum SortingCriteria {
       ImpactValue,
@@ -45 +41 @@
     private IProgress progress;
     private Dictionary<string, double> rawVariableImpacts = new Dictionary<string, double>();
-    private BackgroundWorker worker = new BackgroundWorker();
 
     public new IRegressionSolution Content {
@@ -66 +61 @@
       this.replacementComboBox.SelectedIndex = 0;
       this.factorVarReplComboBox.SelectedIndex = 0;
-
-      //Worker magic
-      worker.WorkerSupportsCancellation = true;
-      worker.WorkerReportsProgress = true;
-      worker.DoWork += Worker_DoWork;
-      worker.RunWorkerCompleted += Worker_RunWorkerCompleted;
-      worker.ProgressChanged += Worker_ProgressChanged;
-    }
-
-
-    private void Worker_DoWork(object sender, DoWorkEventArgs e) {
-      var args = e.Argument as BackgroundworkerArguments;
-
-      //Remember the original ordering of the variables
-      var impacts = RegressionSolutionVariableImpactsCalculator.CalculateImpacts(Content, args.dataPartition, args.replMethod, args.factorReplMethod,
-        (i) => {
-          var worker = (sender as BackgroundWorker);
-          worker.ReportProgress(0, i);
-          return worker.CancellationPending;
-        });
-
-      if ((sender as BackgroundWorker).CancellationPending) { return; }
-      var problemData = Content.ProblemData;
-      var inputvariables = new HashSet<string>(problemData.AllowedInputVariables.Union(Content.Model.VariablesUsedForPrediction));
-      var originalVariableOrdering = problemData.Dataset.VariableNames.Where(v => inputvariables.Contains(v)).Where(problemData.Dataset.VariableHasType<double>).ToList();
-
-      rawVariableImpacts.Clear();
-      originalVariableOrdering.ForEach(v => rawVariableImpacts.Add(v, impacts.First(vv => vv.Item1 == v).Item2));
-    }
-    private void Worker_ProgressChanged(object sender, ProgressChangedEventArgs e) {
-      progress.ProgressValue = (double)e.UserState;
-    }
-    private void Worker_RunWorkerCompleted(object sender, RunWorkerCompletedEventArgs e) {
-      if (e.Error != null) { throw e.Error; }
-      if (e.Error == null && !e.Cancelled) { UpdateDataOrdering(); }
-      ((MainForm.WindowsForms.MainForm)MainFormManager.MainForm).RemoveOperationProgressFromView(this);
     }
 
@@ -134 +93 @@
 
     private void RegressionSolutionVariableImpactsView_VisibleChanged(object sender, EventArgs e) {
-      if (!worker.IsBusy) { return; }
-      worker.CancelAsync();
+      if (!cancellationToken.IsCancellationRequested) {
+        cancellationToken.Cancel();
+      }
     }
 
@@ -173 +133 @@
 
 
-    private void UpdateVariableImpact() {
+    private async void UpdateVariableImpact() {
       //Check if the selection is valid
       if (Content == null) { return; }
@@ -190 +150 @@
       progress.ProgressValue = 0;
 
-      if (!worker.IsBusy) {
-        worker.RunWorkerAsync(new BackgroundworkerArguments() {
-          mainForm = mainForm,
-          dataPartition = dataPartition,
-          factorReplMethod = factorReplMethod,
-          replMethod = replMethod
-        });
+      cancellationToken = new CancellationTokenSource();
+      //Remember the original ordering of the variables
+      try {
+        var impacts = await Task.Run(() => RegressionSolutionVariableImpactsCalculator.CalculateImpacts(Content, dataPartition, replMethod, factorReplMethod,
+          (i) => {
+            progress.ProgressValue = i;
+            return cancellationToken.Token.IsCancellationRequested;
+          }), cancellationToken.Token);
+
+        if (cancellationToken.Token.IsCancellationRequested) { return; }
+        var problemData = Content.ProblemData;
+        var inputvariables = new HashSet<string>(problemData.AllowedInputVariables.Union(Content.Model.VariablesUsedForPrediction));
+        var originalVariableOrdering = problemData.Dataset.VariableNames.Where(v => inputvariables.Contains(v)).Where(problemData.Dataset.VariableHasType<double>).ToList();
+
+        rawVariableImpacts.Clear();
+        originalVariableOrdering.ForEach(v => rawVariableImpacts.Add(v, impacts.First(vv => vv.Item1 == v).Item2));
+        UpdateDataOrdering();
+      } finally {
+        ((MainForm.WindowsForms.MainForm)MainFormManager.MainForm).RemoveOperationProgressFromView(this);
       }
     }