Changeset 12684

Timestamp:

07/08/15 13:59:55 (9 years ago)

Author:

ascheibe

Message:

#2270 statistical analysis view updates now properly when the runcollection is changed

File:

• trunk/sources/HeuristicLab.Analysis.Statistics.Views/3.3/StatisticalTestsView.cs (modified) (26 diffs)

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

@@ -27 +27 @@
 using HeuristicLab.Collections;
 using HeuristicLab.Common;
+using HeuristicLab.Common.Resources;
 using HeuristicLab.Core.Views;
 using HeuristicLab.Data;
@@ -40 +41 @@
     private const int requiredSampleSize = 5;
     private double[][] data;
-    private bool suppressUpdates = false;
-    private bool initializing = false;
+    private bool suppressUpdates;
+    private bool initializing;
 
     public double SignificanceLevel {
@@ -78 +79 @@
 
       if (Content != null) {
-        initializing = true;
-        UpdateResultComboBox();
-        UpdateGroupsComboBox();
-        RebuildDataTable();
-        FillCompComboBox();
+        UpdateUI();
+      } else {
         ResetUI();
-        CalculateValues();
-        initializing = false;
       }
       UpdateCaption();
+    }
+
+    private void UpdateUI() {
+      initializing = true;
+      UpdateResultComboBox();
+      UpdateGroupsComboBox();
+      RebuildDataTable();
+      FillCompComboBox();
+      ResetUI();
+      CalculateValues();
+      initializing = false;
     }
 
@@ -99 +106 @@
       Content.ColumnsChanged += Content_ColumnsChanged;
       Content.RowsChanged += Content_RowsChanged;
-      Content.CollectionReset += new CollectionItemsChangedEventHandler<IRun>(Content_CollectionReset);
+      Content.CollectionReset += Content_CollectionReset;
       Content.UpdateOfRunsInProgressChanged += Content_UpdateOfRunsInProgressChanged;
     }
@@ -107 +114 @@
       Content.ColumnsChanged -= Content_ColumnsChanged;
       Content.RowsChanged -= Content_RowsChanged;
-      Content.CollectionReset -= new CollectionItemsChangedEventHandler<IRun>(Content_CollectionReset);
+      Content.CollectionReset -= Content_CollectionReset;
       Content.UpdateOfRunsInProgressChanged -= Content_UpdateOfRunsInProgressChanged;
     }
@@ -115 +122 @@
       if (InvokeRequired) Invoke((Action<object, EventArgs>)Content_RowsChanged, sender, e);
       else {
-        RebuildDataTable();
+        UpdateUI();
       }
     }
@@ -123 +130 @@
       if (InvokeRequired) Invoke((Action<object, EventArgs>)Content_ColumnsChanged, sender, e);
       else {
-        RebuildDataTable();
+        UpdateUI();
       }
     }
@@ -131 +138 @@
       if (InvokeRequired) Invoke((Action<object, CollectionItemsChangedEventArgs<IRun>>)Content_CollectionReset, sender, e);
       else {
-        RebuildDataTable();
+        UpdateUI();
       }
     }
@@ -139 +146 @@
       else {
         suppressUpdates = Content.UpdateOfRunsInProgress;
-        if (!suppressUpdates) RebuildDataTable();
+        if (!suppressUpdates) UpdateUI();
       }
     }
@@ -153 +160 @@
 
     private void groupCompComboBox_SelectedValueChanged(object sender, EventArgs e) {
-      if (initializing) return;
+      if (initializing || suppressUpdates) return;
       string curItem = (string)groupCompComboBox.SelectedItem;
       CalculatePairwise(curItem);
@@ -159 +166 @@
 
     private void resultComboBox_SelectedValueChanged(object sender, EventArgs e) {
-      if (initializing) return;
+      if (initializing || suppressUpdates) return;
       RebuildDataTable();
       ResetUI();
@@ -166 +173 @@
 
     private void groupComboBox_SelectedValueChanged(object sender, EventArgs e) {
-      if (initializing) return;
+      if (initializing || suppressUpdates) return;
       RebuildDataTable();
       FillCompComboBox();
@@ -175 +182 @@
 
     private void UpdateGroupsComboBox() {
+      string selectedItem = (string)groupComboBox.SelectedItem;
+
       groupComboBox.Items.Clear();
-
       var parameters = (from run in Content
                         where run.Visible
@@ -205 +213 @@
         }
 
-        if (possibleIndizes.Count > 0) {
+        if (selectedItem != null && groupComboBox.Items.Contains(selectedItem)) {
+          groupComboBox.SelectedItem = selectedItem;
+        } else if (possibleIndizes.Count > 0) {
           groupComboBox.SelectedItem = groupComboBox.Items[possibleIndizes.First()];
-        } else {
-          groupComboBox.SelectedItem = groupComboBox.Items[0];
         }
       }
@@ -220 +228 @@
 
     private void UpdateResultComboBox() {
+      string selectedItem = (string)resultComboBox.SelectedItem;
+
       resultComboBox.Items.Clear();
       var results = (from run in Content
@@ -228 +238 @@
 
       resultComboBox.Items.AddRange(results);
-      if (resultComboBox.Items.Count > 0) resultComboBox.SelectedItem = resultComboBox.Items[0];
+
+      if (selectedItem != null && resultComboBox.Items.Contains(selectedItem)) {
+        resultComboBox.SelectedItem = selectedItem;
+      } else if (resultComboBox.Items.Count > 0) {
+        resultComboBox.SelectedItem = resultComboBox.Items[0];
+      }
     }
 
     private void FillCompComboBox() {
+      string selectedItem = (string)groupCompComboBox.SelectedItem;
       string parameterName = (string)groupComboBox.SelectedItem;
       if (parameterName != null) {
@@ -240 +256 @@
           groupCompComboBox.Items.Clear();
           columnNames.ForEach(x => groupCompComboBox.Items.Add(x));
-          if (groupCompComboBox.Items.Count > 0) groupCompComboBox.SelectedItem = groupCompComboBox.Items[0];
+          if (selectedItem != null && groupCompComboBox.Items.Contains(selectedItem)) {
+            groupCompComboBox.SelectedItem = selectedItem;
+          } else if (groupCompComboBox.Items.Count > 0) {
+            groupCompComboBox.SelectedItem = groupCompComboBox.Items[0];
+          }
         }
       }
@@ -330 +350 @@
 
       if (data != null && data.All(x => x != null)) {
-        MainFormManager.GetMainForm<HeuristicLab.MainForm.WindowsForms.MainForm>()
+        MainFormManager.GetMainForm<MainForm.WindowsForms.MainForm>()
           .AddOperationProgressToView(this, "Calculating...");
 
@@ -343 +363 @@
       CalculatePairwiseTest(groupName);
 
-      MainFormManager.GetMainForm<HeuristicLab.MainForm.WindowsForms.MainForm>().RemoveOperationProgressFromView(this);
+      MainFormManager.GetMainForm<MainForm.WindowsForms.MainForm>().RemoveOperationProgressFromView(this);
     }
 
     private void CalculatePairwise(string groupName) {
+      if (groupName == null) return;
       if (!VerifyDataLength(false))
         return;
 
-      MainFormManager.GetMainForm<HeuristicLab.MainForm.WindowsForms.MainForm>().AddOperationProgressToView(pairwiseTestGroupBox, "Calculating...");
+      MainFormManager.GetMainForm<MainForm.WindowsForms.MainForm>().AddOperationProgressToView(pairwiseTestGroupBox, "Calculating...");
       Task.Factory.StartNew(() => CalculatePairwiseAsync(groupName));
     }
@@ -357 +378 @@
       CalculatePairwiseTest(groupName);
 
-      MainFormManager.GetMainForm<HeuristicLab.MainForm.WindowsForms.MainForm>().RemoveOperationProgressFromView(pairwiseTestGroupBox);
+      MainFormManager.GetMainForm<MainForm.WindowsForms.MainForm>().RemoveOperationProgressFromView(pairwiseTestGroupBox);
     }
 
@@ -364 +385 @@
       pValTextBox.Text = pval.ToString();
       if (pval < significanceLevel) {
-        this.Invoke(new Action(() => {
-          groupCompLabel.Image = HeuristicLab.Common.Resources.VSImageLibrary.Default;
+        Invoke(new Action(() => {
+          groupCompLabel.Image = VSImageLibrary.Default;
           groupComTextLabel.Text = "There are groups with different distributions";
         }));
       } else {
-        this.Invoke(new Action(() => {
-          groupCompLabel.Image = HeuristicLab.Common.Resources.VSImageLibrary.Warning;
+        Invoke(new Action(() => {
+          groupCompLabel.Image = VSImageLibrary.Warning;
           groupComTextLabel.Text = "Groups have an equal distribution";
         }));
@@ -381 +402 @@
       DoubleMatrix pValsMatrix = new DoubleMatrix(1, stringConvertibleMatrixView.Content.Columns);
       pValsMatrix.ColumnNames = stringConvertibleMatrixView.Content.ColumnNames;
-      pValsMatrix.RowNames = new string[] { "p-Value" };
+      pValsMatrix.RowNames = new[] { "p-Value" };
 
       for (int i = 0; i < data.Length; i++) {
@@ -391 +412 @@
       // p-value is below significance level and thus the null hypothesis (data is normally distributed) is rejected
       if (res.Any(x => x < significanceLevel)) {
-        this.Invoke(new Action(() => {
-          normalityLabel.Image = HeuristicLab.Common.Resources.VSImageLibrary.Warning;
+        Invoke(new Action(() => {
+          normalityLabel.Image = VSImageLibrary.Warning;
           normalityTextLabel.Text = "Some groups may not be normally distributed";
         }));
       } else {
-        this.Invoke(new Action(() => {
-          normalityLabel.Image = HeuristicLab.Common.Resources.VSImageLibrary.Default;
+        Invoke(new Action(() => {
+          normalityLabel.Image = VSImageLibrary.Default;
           normalityTextLabel.Text = "All sample data is normally distributed";
         }));
       }
 
-      this.Invoke(new Action(() => {
+      Invoke(new Action(() => {
         normalityStringConvertibleMatrixView.Content = pValsMatrix;
         normalityStringConvertibleMatrixView.DataGridView.AutoResizeColumns(DataGridViewAutoSizeColumnsMode.AllCells);
@@ -410 +431 @@
     private void ShowPairwiseResult(int nrOfEqualDistributions) {
       double ratio = ((double)nrOfEqualDistributions) / (data.Length - 1) * 100.0;
-      equalDistsTextBox.Text = ratio.ToString() + " %";
+      equalDistsTextBox.Text = ratio + " %";
 
       if (nrOfEqualDistributions == 0) {
-        this.Invoke(new Action(() => {
-          pairwiseLabel.Image = HeuristicLab.Common.Resources.VSImageLibrary.Default;
+        Invoke(new Action(() => {
+          pairwiseLabel.Image = VSImageLibrary.Default;
           pairwiseTextLabel.Text = "All groups have different distributions";
         }));
       } else {
-        this.Invoke(new Action(() => {
-          pairwiseLabel.Image = HeuristicLab.Common.Resources.VSImageLibrary.Warning;
+        Invoke(new Action(() => {
+          pairwiseLabel.Image = VSImageLibrary.Warning;
           pairwiseTextLabel.Text = "Some groups have equal distributions";
         }));
@@ -432 +453 @@
       double[][] newData = FilterDataForPairwiseTest(colIndex);
 
-      var rowNames = new string[] { "p-Value of Mann-Whitney U", "Adjusted p-Value of Mann-Whitney U", 
+      var rowNames = new[] { "p-Value of Mann-Whitney U", "Adjusted p-Value of Mann-Whitney U", 
             "p-Value of T-Test", "Adjusted p-Value of T-Test", "Cohen's d", "Hedges' g" };
 
@@ -471 +492 @@
       }
 
-      this.Invoke(new Action(() => {
+      Invoke(new Action(() => {
         pairwiseStringConvertibleMatrixView.Content = pValsMatrix;
         pairwiseStringConvertibleMatrixView.DataGridView.AutoResizeColumns(DataGridViewAutoSizeColumnsMode.AllCells);