Changeset 12247 for branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Analysis.Statistics.Views/3.3

Timestamp:

03/24/15 11:17:08 (10 years ago)

Author:

mkommend

Message:

#2276: Merged trunk changes into dataset refactoring branch.

Location:

branches/HeuristicLab.DatasetRefactor/sources

Files:

• . (modified) (1 prop)
• HeuristicLab.Analysis.Statistics.Views/3.3/ChartAnalysisView.cs (modified) (2 diffs)
• HeuristicLab.Analysis.Statistics.Views/3.3/CorrelationView.cs (modified) (3 diffs)
• HeuristicLab.Analysis.Statistics.Views/3.3/SampleSizeInfluenceView.cs (modified) (1 diff)
• HeuristicLab.Analysis.Statistics.Views/3.3/StatisticalTestsView.cs (modified) (3 diffs)

branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Analysis.Statistics.Views/3.3/ChartAnalysisView.cs

@@ -112 +112 @@
 
     void Content_ColumnsChanged(object sender, EventArgs e) {
-      RebuildDataTableAsync();
+      if (!suppressUpdates) {
+        RebuildDataTableAsync();
+      }
     }
 
@@ -289 +291 @@
         double percentile25 = values.Percentile(0.25);
         double percentile75 = values.Percentile(0.75);
-        double lowerAvg = values.OrderBy(x => x).Take((int)(values.Count() * 0.25)).Average();
-        double upperAvg = values.OrderByDescending(x => x).Take((int)(values.Count() * 0.25)).Average();
-        double firstAvg = values.Take((int)(values.Count() * 0.25)).Average();
-        double lastAvg = values.Skip((int)(values.Count() * 0.75)).Average();
+        double lowerAvg = values.Count() > 4 ? values.OrderBy(x => x).Take((int)(values.Count() * 0.25)).Average() : double.NaN;
+        double upperAvg = values.Count() > 4 ? values.OrderByDescending(x => x).Take((int)(values.Count() * 0.25)).Average() : double.NaN;
+        double firstAvg = values.Count() > 4 ? values.Take((int)(values.Count() * 0.25)).Average() : double.NaN;
+        double lastAvg = values.Count() > 4 ? values.Skip((int)(values.Count() * 0.75)).Average() : double.NaN;
         double slope, intercept, r;
         llsFitting.Calculate(values, out slope, out intercept);

branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Analysis.Statistics.Views/3.3/CorrelationView.cs

@@ -56 +56 @@
       stringConvertibleMatrixView.Minimum = -1.0;
       stringConvertibleMatrixView.Maximum = 1.0;
+      stringConvertibleMatrixView.FormatPattern = "0.000";
 
       methodComboBox.Items.Add(PearsonName);
@@ -97 +98 @@
 
     void Content_ColumnsChanged(object sender, EventArgs e) {
-      UpdateUI();
+      if (!suppressUpdates) {
+        UpdateUI();
+      }
     }
 
@@ -212 +215 @@
                 .Where(x => !double.IsNaN(x) && !double.IsNegativeInfinity(x) && !double.IsPositiveInfinity(x));
 
-          if (!rowValues.Any() || !columnValues.Any() || i == j || rowValues.Count() != columnValues.Count()) {
+          if (!rowValues.Any() || !columnValues.Any() || rowValues.Count() != columnValues.Count()) {
             dt[i, j] = double.NaN;
+          } else if (i == j) {
+            dt[i, j] = 1.0;
           } else {
             if (methodName == PearsonName) {

branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Analysis.Statistics.Views/3.3/SampleSizeInfluenceView.cs

@@ -174 +174 @@
         Invoke(new EventHandler(Content_ColumnNamesChanged), sender, e);
       else {
-        UpdateComboBoxes();
+        if (!suppressUpdates) {
+          UpdateComboBoxes();
+        }
       }
     }

branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Analysis.Statistics.Views/3.3/StatisticalTestsView.cs

@@ -109 +109 @@
 
     void Content_ColumnsChanged(object sender, EventArgs e) {
-      RebuildDataTable();
+      if (!Content.UpdateOfRunsInProgress) {
+        RebuildDataTable();
+      }
     }
 
@@ -277 +279 @@
 
       //alglib needs at least 5 samples for computation
-      if (data.Any(x => x.Length <= requiredSampleSize)) {
+      if (data.Any(x => x.Length < requiredSampleSize)) {
         if (showMessage)
           MessageBox.Show(this, "You need at least " + requiredSampleSize
@@ -291 +293 @@
         return;
 
-      if (data != null) {
+      if (data != null && data.All(x => x != null)) {
         MainFormManager.GetMainForm<HeuristicLab.MainForm.WindowsForms.MainForm>()
           .AddOperationProgressToView(this, "Calculating...");