Changeset 13938 for trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/FeatureCorrelation/FeatureCorrelationView.cs

Timestamp:

06/27/16 15:28:26 (8 years ago)

Author:

mkommend

Message:

#2619:

• Refactored and separated the different feature correlation calculations.
• Added a checkbox to ignore missing values in the calculation.

File:

• trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/FeatureCorrelation/FeatureCorrelationView.cs (modified) (7 diffs)

trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/FeatureCorrelation/FeatureCorrelationView.cs

@@ -34 +34 @@
 
     private FeatureCorrelationCache correlationCache;
+    private new FeatureCorrelationCalculator CorrelationCalculator {
+      get { return (FeatureCorrelationCalculator)base.CorrelationCalculator; }
+      set { base.CorrelationCalculator = value; }
+    }
 
     public FeatureCorrelationView()
       : base() {
       InitializeComponent();
+      CorrelationCalculator = new FeatureCorrelationCalculator();
       correlationCache = new FeatureCorrelationCache();
     }
@@ -49 +54 @@
     }
 
+    private void ignoreMissingValuesCheckbox_CheckedChanged(object sender, EventArgs e) {
+      CalculateCorrelation();
+    }
+
     protected override void CalculateCorrelation() {
       if (correlationCalcComboBox.SelectedItem == null) return;
@@ -56 +65 @@
       string partition = (string)partitionComboBox.SelectedValue;
       dataView.Enabled = false;
-      double[,] corr = correlationCache.GetCorrelation(calc, partition);
+      double[,] corr = correlationCache.GetCorrelation(calc, partition, ignoreMissingValuesCheckbox.Checked);
       if (corr == null) {
-        fcc.CalculateElements(calc, partition);
+        CorrelationCalculator.CalculateElements(Content, calc, partition, ignoreMissingValuesCheckbox.Checked);
       } else {
-        fcc.TryCancelCalculation();
+        CorrelationCalculator.TryCancelCalculation();
         var correlation = new DoubleMatrix(corr, Content.Dataset.DoubleVariables, Content.Dataset.DoubleVariables);
         UpdateDataView(correlation);
@@ -66 +75 @@
     }
 
-
-
-    protected override void Content_CorrelationCalculationFinished(object sender, FeatureCorrelationCalculator.CorrelationCalculationFinishedArgs e) {
+    protected override void FeatureCorrelation_CalculationFinished(object sender, AbstractFeatureCorrelationCalculator.CorrelationCalculationFinishedArgs e) {
       if (InvokeRequired) {
-        Invoke(new FeatureCorrelationCalculator.CorrelationCalculationFinishedHandler(Content_CorrelationCalculationFinished), sender, e);
+        Invoke(new AbstractFeatureCorrelationCalculator.CorrelationCalculationFinishedHandler(FeatureCorrelation_CalculationFinished), sender, e);
         return;
       }
-      correlationCache.SetCorrelation(e.Calculcator, e.Partition, e.Correlation);
+      correlationCache.SetCorrelation(e.Calculcator, e.Partition, e.IgnoreMissingValues, e.Correlation);
+
       var correlation = new DoubleMatrix(e.Correlation, Content.Dataset.DoubleVariables, Content.Dataset.DoubleVariables);
       UpdateDataView(correlation);
@@ -80 +88 @@
     [NonDiscoverableType]
     private class FeatureCorrelationCache : Object {
-      private Dictionary<Tuple<IDependencyCalculator, string>, double[,]> correlationsCache;
+      private Dictionary<Tuple<IDependencyCalculator, string, bool>, double[,]> correlationsCache;
 
       public FeatureCorrelationCache()
@@ -88 +96 @@
 
       private void InitializeCaches() {
-        correlationsCache = new Dictionary<Tuple<IDependencyCalculator, string>, double[,]>();
+        correlationsCache = new Dictionary<Tuple<IDependencyCalculator, string, bool>, double[,]>();
       }
 
@@ -95 +103 @@
       }
 
-      public double[,] GetCorrelation(IDependencyCalculator calc, string partition) {
+      public double[,] GetCorrelation(IDependencyCalculator calc, string partition, bool ignoreMissingValues) {
         double[,] corr;
-        var key = new Tuple<IDependencyCalculator, string>(calc, partition);
+        var key = Tuple.Create(calc, partition, ignoreMissingValues);
         correlationsCache.TryGetValue(key, out corr);
         return corr;
       }
 
-      public void SetCorrelation(IDependencyCalculator calc, string partition, double[,] correlation) {
-        var key = new Tuple<IDependencyCalculator, string>(calc, partition);
+      public void SetCorrelation(IDependencyCalculator calc, string partition, bool ignoreMissingValues, double[,] correlation) {
+        var key = Tuple.Create(calc, partition, ignoreMissingValues);
         correlationsCache[key] = correlation;
       }