Changeset 13441

Timestamp:

12/07/15 17:37:45 (8 years ago)

Author:

gkronber

Message:

#2071

• added statement to set number of rows parsed which was lost in one of the previous changes
• added an necessary invoke call in RegressionInstanceProviderView

Location:

trunk/sources

Files:

• HeuristicLab.Problems.Instances.DataAnalysis.Views/3.3/RegressionInstanceProviderView.cs (modified) (1 diff)
• HeuristicLab.Problems.Instances.DataAnalysis/3.3/TableFileParser.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis.Views/3.3/RegressionInstanceProviderView.cs

@@ -64 +64 @@
           try {
             GenericConsumer.Load(instance);
-            instancesComboBox.SelectedIndex = -1;
           } catch (IOException ex) {
             ErrorWhileLoading(ex, importTypeDialog.Path);
           } finally {
+            Invoke((Action)(() => instancesComboBox.SelectedIndex = -1));
             mainForm.RemoveOperationProgressFromContent(activeView.Content);
           }

trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3/TableFileParser.cs

@@ -227 +227 @@
       }
 
+      this.rows = values.First().Count;
+
       // after everything has been parsed make sure the lists are as compact as possible
       foreach (var l in values) {
@@ -369 +371 @@
           try {
             BytesRead = reader.BaseStream.Position;
-          }
-          catch (IOException) {
+          } catch (IOException) {
             BytesRead += CurrentLine.Length + 2; // guess
-          }
-          catch (NotSupportedException) {
+          } catch (NotSupportedException) {
             BytesRead += CurrentLine.Length + 2;
           }