Changeset 11378

Timestamp:

09/17/14 17:34:43 (10 years ago)

Author:

ascheibe

Message:

#2031 improved correlation view and some clean ups

Location:

branches/StatisticalTesting/HeuristicLab.Analysis.Statistics/3.3

Files:

• ChartAnalysisView.cs (modified) (5 diffs)
• CorrelationView.cs (modified) (6 diffs)
• SampleSizeInfluenceView.cs (modified) (4 diffs)

branches/StatisticalTesting/HeuristicLab.Analysis.Statistics/3.3/ChartAnalysisView.cs

@@ -114 +114 @@
     private void RegisterRunEvents(IEnumerable<IRun> runs) {
       foreach (IRun run in runs) {
-        RegisterRunParametersEvents(run);
         RegisterRunResultsEvents(run);
       }
@@ -121 +120 @@
     private void DeregisterRunEvents(IEnumerable<IRun> runs) {
       foreach (IRun run in runs) {
-        DeregisterRunParametersEvents(run);
         DeregisterRunResultsEvents(run);
       }
-    }
-
-    private void RegisterRunParametersEvents(IRun run) {
-      IObservableDictionary<string, IItem> dict = run.Parameters;
-      dict.ItemsAdded += run_Changed;
-      dict.ItemsRemoved += run_Changed;
-      dict.ItemsReplaced += run_Changed;
-      dict.CollectionReset += run_Changed;
     }
 
@@ -142 +132 @@
     }
 
-    private void DeregisterRunParametersEvents(IRun run) {
-      IObservableDictionary<string, IItem> dict = run.Parameters;
-      dict.ItemsAdded -= run_Changed;
-      dict.ItemsRemoved -= run_Changed;
-      dict.ItemsReplaced -= run_Changed;
-      dict.CollectionReset -= run_Changed;
-    }
-
     private void DeregisterRunResultsEvents(IRun run) {
       IObservableDictionary<string, IItem> dict = run.Results;
@@ -175 +157 @@
     }
 
-    void Content_UpdateOfRunsInProgressChanged(object sender, EventArgs e) {
+    private void Content_UpdateOfRunsInProgressChanged(object sender, EventArgs e) {
       suppressUpdates = Content.UpdateOfRunsInProgress;
 
@@ -196 +178 @@
 
     #region Events
-    void DataGridView_RowHeaderMouseDoubleClick(object sender, DataGridViewCellMouseEventArgs e) {
+    private void DataGridView_RowHeaderMouseDoubleClick(object sender, DataGridViewCellMouseEventArgs e) {
       if (e.RowIndex >= 0) {
         IRun run = runs[stringConvertibleMatrixView.GetRowIndex(e.RowIndex)];

branches/StatisticalTesting/HeuristicLab.Analysis.Statistics/3.3/CorrelationView.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Linq;
-using System.Windows.Forms;
+using HeuristicLab.Collections;
+using HeuristicLab.Core;
 using HeuristicLab.Core.Views;
 using HeuristicLab.Data;
@@ -49 +50 @@
 
     private Dictionary<string, ResultParameterType> resultsParameters;
+    private bool suppressUpdates = false;
 
     public CorrelationView() {
@@ -61 +63 @@
 
       if (Content != null) {
-        resultsParameters = GetRowNames();
         UpdateResultComboBox();
       }
@@ -78 +79 @@
       Content.CollectionReset += new HeuristicLab.Collections.CollectionItemsChangedEventHandler<IRun>(Content_CollectionReset);
       Content.UpdateOfRunsInProgressChanged += Content_UpdateOfRunsInProgressChanged;
+      RegisterRunEvents(Content);
     }
 
@@ -86 +88 @@
       Content.CollectionReset -= new HeuristicLab.Collections.CollectionItemsChangedEventHandler<IRun>(Content_CollectionReset);
       Content.UpdateOfRunsInProgressChanged -= Content_UpdateOfRunsInProgressChanged;
+      DeregisterRunEvents(Content);
+    }
+
+    private void RegisterRunEvents(IEnumerable<IRun> runs) {
+      foreach (IRun run in runs) {
+        RegisterRunResultsEvents(run);
+        RegisterRunParametersEvents(run);
+        run.PropertyChanged += run_PropertyChanged;
+      }
+    }
+
+    private void DeregisterRunEvents(IEnumerable<IRun> runs) {
+      foreach (IRun run in runs) {
+        DeregisterRunResultsEvents(run);
+        DeregisterRunParametersEvents(run);
+        run.PropertyChanged -= run_PropertyChanged;
+      }
+    }
+
+    private void RegisterRunResultsEvents(IRun run) {
+      IObservableDictionary<string, IItem> dict = run.Results;
+      dict.ItemsAdded += run_Changed;
+      dict.ItemsRemoved += run_Changed;
+      dict.ItemsReplaced += run_Changed;
+      dict.CollectionReset += run_Changed;
+    }
+
+    private void DeregisterRunResultsEvents(IRun run) {
+      IObservableDictionary<string, IItem> dict = run.Results;
+      dict.ItemsAdded -= run_Changed;
+      dict.ItemsRemoved -= run_Changed;
+      dict.ItemsReplaced -= run_Changed;
+      dict.CollectionReset -= run_Changed;
+    }
+
+    private void RegisterRunParametersEvents(IRun run) {
+      IObservableDictionary<string, IItem> dict = run.Parameters;
+      dict.ItemsAdded += run_Changed;
+      dict.ItemsRemoved += run_Changed;
+      dict.ItemsReplaced += run_Changed;
+      dict.CollectionReset += run_Changed;
+    }
+
+    private void DeregisterRunParametersEvents(IRun run) {
+      IObservableDictionary<string, IItem> dict = run.Parameters;
+      dict.ItemsAdded -= run_Changed;
+      dict.ItemsRemoved -= run_Changed;
+      dict.ItemsReplaced -= run_Changed;
+      dict.CollectionReset -= run_Changed;
     }
 
     private void Content_CollectionReset(object sender, HeuristicLab.Collections.CollectionItemsChangedEventArgs<IRun> e) {
-      RebuildCorrelationTable();
+      UpdateUI();
     }
 
     private void Content_ItemsRemoved(object sender, HeuristicLab.Collections.CollectionItemsChangedEventArgs<IRun> e) {
-      RebuildCorrelationTable();
+      UpdateUI();
     }
 
     private void Content_ItemsAdded(object sender, HeuristicLab.Collections.CollectionItemsChangedEventArgs<IRun> e) {
-      RebuildCorrelationTable();
-    }
-
-    void Content_UpdateOfRunsInProgressChanged(object sender, EventArgs e) {
-      if (!Content.UpdateOfRunsInProgress) {
+      UpdateUI();
+    }
+
+    private void Content_UpdateOfRunsInProgressChanged(object sender, EventArgs e) {
+      suppressUpdates = Content.UpdateOfRunsInProgress;
+      UpdateUI();
+    }
+
+    private void run_Changed(object sender, EventArgs e) {
+      if (InvokeRequired) {
+        Invoke(new EventHandler(run_Changed), sender, e);
+      }
+      UpdateUI();
+    }
+
+    void run_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e) {
+      UpdateUI();
+    }
+    #endregion
+
+    private void UpdateUI() {
+      if (!suppressUpdates) {
+        UpdateResultComboBox();
         RebuildCorrelationTable();
       }
     }
-    #endregion
 
     private void UpdateResultComboBox() {
+      resultsParameters = GetRowNames();
+      string selectedResult = (string)this.resultComboBox.SelectedItem;
       resultComboBox.Items.Clear();
-
       resultComboBox.Items.AddRange(resultsParameters.Keys.ToArray());
-      if (resultComboBox.Items.Count > 0) resultComboBox.SelectedItem = resultComboBox.Items[0];
+
+      if (selectedResult != null && resultComboBox.Items.Contains(selectedResult)) {
+        resultComboBox.SelectedItem = selectedResult;
+      } else if (resultComboBox.Items.Count > 0) {
+        resultComboBox.SelectedItem = resultComboBox.Items[0];
+      }
     }
 
@@ -195 +269 @@
         var resultVals = GetDoublesFromResults(runs.Where(x => x.Results.ContainsKey(resultName)).Where(x => x.Results[resultName] is DoubleValue || x.Results[resultName] is IntValue).ToList(), resultName);
 
-        List<double> resultRowVals = new List<double>();
+        List<double> resultRowVals;
         if (rowName.Value == ResultParameterType.Result) {
           resultRowVals = GetDoublesFromResults(runs.Where(x => x.Results.ContainsKey(rowName.Key)).Where(x => x.Results[rowName.Key] is DoubleValue || x.Results[rowName.Key] is IntValue).ToList(), rowName.Key);

branches/StatisticalTesting/HeuristicLab.Analysis.Statistics/3.3/SampleSizeInfluenceView.cs

@@ -141 +141 @@
       DeregisterRunEvents(e.OldItems);
       RegisterRunEvents(e.Items);
+      UpdateAll();
     }
     private void Content_ItemsRemoved(object sender, CollectionItemsChangedEventArgs<IRun> e) {
       DeregisterRunEvents(e.Items);
+      UpdateComboBoxes();
     }
     private void Content_ItemsAdded(object sender, CollectionItemsChangedEventArgs<IRun> e) {
       RegisterRunEvents(e.Items);
+      UpdateComboBoxes();
     }
     private void Content_UpdateOfRunsInProgressChanged(object sender, EventArgs e) {
@@ -191 +194 @@
     protected override void OnContentChanged() {
       base.OnContentChanged();
+      UpdateAll();
+    }
+
+    private void UpdateAll() {
       this.categoricalMapping.Clear();
       UpdateComboBoxes();
@@ -233 +240 @@
         this.yAxisComboBox.Items.AddRange(Matrix.ColumnNames.ToArray());
 
-        bool changed = false;
         if (selectedYAxis != null && yAxisComboBox.Items.Contains(selectedYAxis)) {
           yAxisComboBox.SelectedItem = selectedYAxis;
-          changed = true;
-        }
-        if (changed)
           UpdateDataPoints();
+        }
       }
     }
@@ -340 +344 @@
           }
 
-          string columnName = string.Empty;
-          if (value != null && value is DoubleValue || value is IntValue) {
-            columnName = selectedAxis + ": ";
-            columnName += value.ToString();
-          } else {
-            columnName = series.Name;
-          }
-
+          string columnName = series.Name;
           columnNames.Add(columnName);
         }