Changeset 14330 for branches/symbreg-factors-2650/HeuristicLab.Problems.Instances.DataAnalysis.Views/3.3

Timestamp:

10/13/16 19:47:41 (8 years ago)

Author:

gkronber

Message:

#2650 Merged r14282:14322 from trunk to branch (fixing conflicts)

Location:

branches/symbreg-factors-2650

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.Instances.DataAnalysis.Views (modified) (1 prop)
• HeuristicLab.Problems.Instances.DataAnalysis.Views/3.3/DataAnalysisImportTypeDialog.cs (modified) (1 diff)
• HeuristicLab.Problems.Instances.DataAnalysis.Views/3.3/RegressionInstanceProviderView.cs (modified) (1 diff)

branches/symbreg-factors-2650/HeuristicLab.Problems.Instances.DataAnalysis.Views/3.3/DataAnalysisImportTypeDialog.cs

@@ -158 +158 @@
       }
       catch (Exception ex) {
-        if (ex is IOException || ex is InvalidOperationException || ex is ArgumentException || ex is TableFileParser.DataFormatException) {
+        if (ex is IOException || ex is InvalidOperationException || ex is ArgumentException) {
           OkButton.Enabled = false;
           ErrorTextBox.Text = ex.Message;

branches/symbreg-factors-2650/HeuristicLab.Problems.Instances.DataAnalysis.Views/3.3/RegressionInstanceProviderView.cs

@@ -52 +52 @@
 
           try {
-            var progress = mainForm.AddOperationProgressToContent(activeView.Content, "Loading problem instance.");
+            var progress = mainForm.AddOperationProgressToContent(activeView.Content,
+              "Loading problem instance.");
 
-            Content.ProgressChanged += (o, args) => { progress.ProgressValue = args.ProgressPercentage / 100.0; };
+            Content.ProgressChanged +=
+              (o, args) => { progress.ProgressValue = args.ProgressPercentage / 100.0; };
 
-            instance = Content.ImportData(importTypeDialog.Path, importTypeDialog.ImportType, importTypeDialog.CSVFormat);
-          } catch (IOException ex) {
+            instance = Content.ImportData(importTypeDialog.Path, importTypeDialog.ImportType,
+              importTypeDialog.CSVFormat);
+          } catch (Exception ex) {
             ErrorWhileParsing(ex);
+            return;
+          } finally {
             mainForm.RemoveOperationProgressFromContent(activeView.Content);
-            return;
           }
+
           try {
             GenericConsumer.Load(instance);
-          } catch (IOException ex) {
+          } catch (Exception ex) {
             ErrorWhileLoading(ex, importTypeDialog.Path);
           } finally {