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

Timestamp:

10/30/12 13:33:10 (11 years ago)

Author:

sforsten

Message:

#1292:

• put IDependencyCalculators in own directory
• changed DoubleRange Interval to double Minimum\Maximum in IDependencyCalculator
• AbstractFeatureCorrelationView now uses DoubleMatrix instead of HeatMap

File:

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

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

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Windows.Forms;
-using HeuristicLab.Analysis;
 using HeuristicLab.Data;
 using HeuristicLab.MainForm;
@@ -61 +60 @@
         } else {
           fcc.TryCancelCalculation();
-          SetNewCorrelation(corr, calc);
+          SetNewCorrelation(corr);
           UpdateDataView();
         }
@@ -67 +66 @@
     }
 
-    private void SetNewCorrelation(double[,] elements, IDependencyCalculator calc) {
-      DoubleRange range = calc.Interval;
-      HeatMap hm = new HeatMap(elements, "", range.End, range.Start);
-      hm.RowNames = Content.Dataset.DoubleVariables;
-      hm.ColumnNames = Content.Dataset.DoubleVariables;
-      currentCorrelation = hm;
+    private void SetNewCorrelation(double[,] elements) {
+      currentCorrelation = new DoubleMatrix(elements,
+                                            Content.Dataset.DoubleVariables,
+                                            Content.Dataset.DoubleVariables);
     }
 
@@ -80 +77 @@
       } else {
         correlationCache.SetCorrelation(e.Calculcator, e.Partition, e.Correlation);
-        SetNewCorrelation(e.Correlation, e.Calculcator);
+        SetNewCorrelation(e.Correlation);
         UpdateDataView();
       }