Ticket #2845: try-finally for Progress.patch

HeuristicLab.Analysis.Statistics.Views/3.3/ChartAnalysisView.cs

@@ -171 +171 @@
       RebuildDataTableAsync();
     }
 
-    private void addLineToChart_Click(object sender, EventArgs e) {
-      Progress.Show(this, "Adding fitted lines to charts...", ProgressMode.Indeterminate);
-
+    private async void addLineToChart_Click(object sender, EventArgs e) {
       string resultName = (string)dataTableComboBox.SelectedItem;
       string rowName = (string)dataRowComboBox.SelectedItem;
 
-      var task = Task.Factory.StartNew(() => AddLineToChart(resultName, rowName));
-
-      task.ContinueWith((t) => {
+      Progress.Show(this, "Adding fitted lines to charts...", ProgressMode.Indeterminate);
+      try {
+        await Task.Run(() => AddLineToChart(resultName, rowName));
+      } catch (Exception exc) {
+        ErrorHandling.ShowErrorDialog(this, "An error occured while adding lines to charts. ", exc);
+      } finally {
         Progress.Hide(this);
-        ErrorHandling.ShowErrorDialog("An error occured while adding lines to charts. ", t.Exception);
-      }, TaskContinuationOptions.OnlyOnFaulted);
-
-      task.ContinueWith((t) => {
-        Progress.Hide(this);
-      }, TaskContinuationOptions.OnlyOnRanToCompletion);
+      }
     }
 
     private void AddLineToChart(string resultName, string rowName) {

HeuristicLab.Analysis.Statistics.Views/3.3/StatisticalTestsView.cs

@@ -350 +350 @@
       return true;
     }
 
-    private void CalculateValues() {
+    private async void CalculateValues() {
       if (!VerifyDataLength(true))
         return;
 
       if (data != null && data.All(x => x != null)) {
+        string curItem = (string)groupCompComboBox.SelectedItem;
+
         Progress.Show(this, "Calculating...", ProgressMode.Indeterminate);
-
-        string curItem = (string)groupCompComboBox.SelectedItem;
-        Task.Factory.StartNew(() => CalculateValuesAsync(curItem));
+        try {
+          await Task.Run(() => CalculateValues(curItem));
+        } finally { Progress.Hide(this); }
       }
     }
 
-    private void CalculateValuesAsync(string groupName) {
+    private void CalculateValues(string groupName) {
       CalculateAllGroupsTest();
       CalculateNormalityTest();
       CalculatePairwiseTest(groupName);
-
-      Progress.Hide(this);
     }
 
     private void CalculatePairwise(string groupName) {
@@ -375 +375 @@
       if (!VerifyDataLength(false))
         return;
 
-      Progress.ShowOnControl(pairwiseTestGroupBox, "Calculating...", ProgressMode.Indeterminate);
-      Task.Factory.StartNew(() => CalculatePairwiseAsync(groupName));
-    }
-
-    private void CalculatePairwiseAsync(string groupName) {
       CalculatePairwiseTest(groupName);
-
-      Progress.HideFromControl(pairwiseTestGroupBox);
     }
 
     private void CalculateAllGroupsTest() {

HeuristicLab.Clients.OKB.Views/3.3/RunCreation/Views/OKBExperimentUploadView.cs

@@ -210 +210 @@
     private void UploadAsync() {
       var message = "Uploading runs to OKB...";
       IProgress progress = Progress.Show(this, message);
-      double count = dataGridView.Rows.Count;
-      int i = 0;
-      foreach (DataGridViewRow row in dataGridView.Rows) {
-        i++;
-        if (!Convert.ToBoolean(row.Cells[UploadColumn.Name].Value)) continue;
-        selectedAlgorithm = algorithms.FirstOrDefault(x => x.Name == row.Cells[OKBAlgorithmColumn.Name].Value.ToString());
-        selectedProblem = problems.FirstOrDefault(x => x.Name == row.Cells[OKBProblemColumn.Name].Value.ToString());
-        if (selectedAlgorithm == null || selectedProblem == null) {
-          throw new ArgumentException("Can't retrieve the algorithm/problem to upload");
+      try {
+        double count = dataGridView.Rows.Count;
+        int i = 0;
+        foreach (DataGridViewRow row in dataGridView.Rows) {
+          i++;
+          if (!Convert.ToBoolean(row.Cells[UploadColumn.Name].Value)) continue;
+          selectedAlgorithm = algorithms.FirstOrDefault(x => x.Name == row.Cells[OKBAlgorithmColumn.Name].Value.ToString());
+          selectedProblem = problems.FirstOrDefault(x => x.Name == row.Cells[OKBProblemColumn.Name].Value.ToString());
+          if (selectedAlgorithm == null || selectedProblem == null) {
+            throw new ArgumentException("Can't retrieve the algorithm/problem to upload");
+          }
+
+          OKBRun run = new OKBRun(selectedAlgorithm.Id, selectedProblem.Id, row.Tag as IRun, UserInformation.Instance.User.Id);
+          run.Store();
+          progress.ProgressValue = ((double)i) / count;
         }
-
-        OKBRun run = new OKBRun(selectedAlgorithm.Id, selectedProblem.Id, row.Tag as IRun, UserInformation.Instance.User.Id);
-        run.Store();
-        progress.ProgressValue = ((double)i) / count;
+      } finally {
+        Progress.Hide(this);
+        ClearRuns();
       }
-      Progress.Hide(this);
-      ClearRuns();
     }
 
     private void dataGridView_CellMouseClick(object sender, DataGridViewCellMouseEventArgs e) {

HeuristicLab.DataPreprocessing.Views/3.4/DataPreprocessingView.cs

@@ -173 +173 @@
             instance = instanceProvider.ImportData(importDialog.Path, getImportType(importDialog), importDialog.CSVFormat);
           } catch (IOException ex) {
             MessageBox.Show(string.Format("There was an error parsing the file: {0}", Environment.NewLine + ex.Message), "Error while parsing", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            return;
+          } finally {
             Progress.Hide(Content);
-            return;
           }
           try {
             Content.Import(instance);

HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views/3.4/SymbolicClassificationSolutionView.cs

@@ -22 +22 @@
 using System;
 using System.ComponentModel;
 using System.Linq;
+using System.Threading.Tasks;
 using System.Windows.Forms;
 using HeuristicLab.MainForm;
 using HeuristicLab.Problems.DataAnalysis.Symbolic.Views;
@@ -52 +53 @@
       view.Show();
     }
 
-    private void exportButton_Click(object sender, EventArgs e) {
+    private async void exportButton_Click(object sender, EventArgs e) {
       var exporter = new SymbolicSolutionExcelExporter();
       exportFileDialog.Filter = exporter.FileTypeFilter;
       if (exportFileDialog.ShowDialog(this) == DialogResult.OK) {
+        var name = exportFileDialog.FileName;
 
-        var name = exportFileDialog.FileName;
-        using (BackgroundWorker bg = new BackgroundWorker()) {
-          Progress.Show(this, "Exportion solution to " + name + ".", ProgressMode.Indeterminate);
-          bg.DoWork += (o, a) => exporter.Export(Content, name);
-          bg.RunWorkerCompleted += (o, a) => Progress.Hide(this);
-          bg.RunWorkerAsync();
+        Progress.Show(this, "Export solution to " + name + ".", ProgressMode.Indeterminate);
+        try {
+          await Task.Run(() => exporter.Export(Content, name));
+        } finally {
+          Progress.Hide(this);
         }
       }
     }

HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views/3.4/SymbolicDiscriminantFunctionClassificationSolutionView.cs

@@ -22 +22 @@
 using System;
 using System.ComponentModel;
 using System.Linq;
+using System.Threading.Tasks;
 using System.Windows.Forms;
 using HeuristicLab.MainForm;
 using HeuristicLab.Problems.DataAnalysis.Views;
@@ -51 +52 @@
       view.Show();
     }
 
-    private void exportButton_Click(object sender, EventArgs e) {
+    private async void exportButton_Click(object sender, EventArgs e) {
       var exporter = new SymbolicDiscriminantFunctionClassificationSolutionExcelExporter();
       exportFileDialog.Filter = exporter.FileTypeFilter;
       if (exportFileDialog.ShowDialog(this) == DialogResult.OK) {
+        var name = exportFileDialog.FileName;
 
-        var name = exportFileDialog.FileName;
-        using (BackgroundWorker bg = new BackgroundWorker()) {
-          Progress.Show(this, "Exportion solution to " + name + ".", ProgressMode.Indeterminate);
-          bg.DoWork += (o, a) => exporter.Export(Content, name);
-          bg.RunWorkerCompleted += (o, a) => Progress.Hide(this);
-          bg.RunWorkerAsync();
+        Progress.Show(this, "Export solution to " + name + ".", ProgressMode.Indeterminate);
+        try {
+          await Task.Run(() => exporter.Export(Content, name));
+        } finally {
+          Progress.Hide(this);
         }
       }
     }

HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/SymbolicRegressionSolutionView.cs

@@ -22 +22 @@
 using System;
 using System.ComponentModel;
 using System.Linq;
+using System.Threading.Tasks;
 using System.Windows.Forms;
 using HeuristicLab.MainForm;
 using HeuristicLab.Problems.DataAnalysis.Symbolic.Views;
@@ -54 +55 @@
       view.Content = (SymbolicRegressionSolution)this.Content.Clone();
     }
 
-    private void exportButton_Click(object sender, EventArgs e) {
+    private async void exportButton_Click(object sender, EventArgs e) {
       var exporter = new SymbolicSolutionExcelExporter();
       exportFileDialog.Filter = exporter.FileTypeFilter;
       if (exportFileDialog.ShowDialog(this) == DialogResult.OK) {
         var name = exportFileDialog.FileName;
-        using (BackgroundWorker bg = new BackgroundWorker()) {
-          Progress.Show(this, "Exporting solution to " + name + ".", ProgressMode.Indeterminate);
-          bg.DoWork += (o, a) => exporter.Export(Content, name);
-          bg.RunWorkerCompleted += (o, a) => Progress.Hide(this);
-          bg.RunWorkerAsync();
+
+        Progress.Show(this, "Export solution to " + name + ".", ProgressMode.Indeterminate);
+        try {
+          await Task.Run(() => exporter.Export(Content, name));
+        } finally {
+          Progress.Hide(this);
         }
       }
     }

HeuristicLab.Problems.DataAnalysis.Views/3.4/MenuItems/ShrinkDataAnalysisRunsMenuItem.cs

@@ -24 +24 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading.Tasks;
 using HeuristicLab.MainForm;
 using HeuristicLab.Optimization;
 using HeuristicLab.Optimizer;
-
 using MenuItem = HeuristicLab.MainForm.WindowsForms.MenuItem;
 
 namespace HeuristicLab.Problems.DataAnalysis.Views {
@@ -69 +69 @@
       ToolStripItem.Enabled = runCollection.Any(run => run.Parameters.Any(p => p.Value is IDataAnalysisProblemData));
     }
 
-    public override void Execute() {
+    public override async void Execute() {
       IContentView activeView = (IContentView)MainFormManager.MainForm.ActiveView;
       var content = activeView.Content;
       Progress.Show(content, "Removing duplicate datasets.", ProgressMode.Indeterminate);
 
-      Action<IContentView> action = (view) => DatasetUtil.RemoveDuplicateDatasets(view.Content);
-
-      action.BeginInvoke(activeView, delegate (IAsyncResult result) {
-        action.EndInvoke(result);
+      try {
+        await Task.Run(() => DatasetUtil.RemoveDuplicateDatasets(content));
+      } finally {
         Progress.Hide(content);
-      }, null);
+      }
     }
   }
 }