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

Timestamp:

10/30/12 13:33:10 (12 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

Location:

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

Files:

• AbstractFeatureCorrelationView.cs (modified) (4 diffs)
• EnhancedStringConvertibleMatrixView.cs (modified) (3 diffs)
• FeatureCorrelationView.cs (modified) (4 diffs)
• TimeframeFeatureCorrelationView.cs (modified) (3 diffs)

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

@@ -23 +23 @@
 using System.Linq;
 using System.Windows.Forms;
-using HeuristicLab.Analysis;
+using HeuristicLab.Data;
 using HeuristicLab.MainForm;
 using HeuristicLab.MainForm.WindowsForms;
@@ -33 +33 @@
   public abstract partial class AbstractFeatureCorrelationView : AsynchronousContentView {
     protected FeatureCorrelationCalculator fcc;
-    protected HeatMap currentCorrelation;
+    protected DoubleMatrix currentCorrelation;
 
     public new DataAnalysisProblemData Content {
@@ -72 +72 @@
         CalculateCorrelation();
       } else {
+        dataView.Maximum = 0;
+        dataView.Minimum = 0;
         dataView.Content = null;
         dataView.ResetVisibility();
@@ -98 +100 @@
 
     protected void UpdateDataView() {
-      maximumLabel.Text = currentCorrelation.Maximum.ToString();
-      minimumLabel.Text = currentCorrelation.Minimum.ToString();
+      IDependencyCalculator calc = (IDependencyCalculator)CorrelationCalcComboBox.SelectedValue;
+      maximumLabel.Text = calc.Maximum.ToString();
+      minimumLabel.Text = calc.Minimum.ToString();
 
       currentCorrelation.SortableView = true;
+      dataView.Maximum = calc.Maximum;
+      dataView.Minimum = calc.Minimum;
       dataView.Content = currentCorrelation;
       dataView.Enabled = true;

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

@@ -25 +25 @@
 using System.Linq;
 using System.Windows.Forms;
-using HeuristicLab.Analysis;
 using HeuristicLab.Common;
+using HeuristicLab.Data;
 using HeuristicLab.Data.Views;
 
@@ -39 +39 @@
     public IEnumerable<bool> RowVisibility { set { rowVisibility = value; } }
 
-    public new HeatMap Content {
-      get { return (HeatMap)base.Content; }
+    public double Maximum { get; set; }
+    public double Minimum { get; set; }
+
+    public new DoubleMatrix Content {
+      get { return (DoubleMatrix)base.Content; }
       set { base.Content = value; }
     }
@@ -94 +97 @@
 
       int rowIndex = virtualRowIndices[e.RowIndex];
-      Color backColor = GetDataPointColor(Content[rowIndex, e.ColumnIndex], Content.Minimum, Content.Maximum);
+      Color backColor = GetDataPointColor(Content[rowIndex, e.ColumnIndex], Minimum, Maximum);
       using (Brush backColorBrush = new SolidBrush(backColor)) {
         e.Graphics.FillRectangle(backColorBrush, e.CellBounds);

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();
       }

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

@@ -24 +24 @@
 using System.Linq;
 using System.Windows.Forms;
-using HeuristicLab.Analysis;
 using HeuristicLab.Data;
 using HeuristicLab.MainForm;
@@ -101 +100 @@
         Array.Copy(elements, i * elements.GetLength(1), neededValues, i * neededValues.GetLength(1), frames + 1);
       }
-      SetNewCorrelation(neededValues, calc);
+      SetNewCorrelation(neededValues);
     }
 
-    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 = Enumerable.Range(0, elements.GetLength(1)).Select(x => x.ToString());
-      currentCorrelation = hm;
+    private void SetNewCorrelation(double[,] elements) {
+      currentCorrelation = new DoubleMatrix(elements,
+                                            Enumerable.Range(0, elements.GetLength(1)).Select(x => x.ToString()),
+                                            Content.Dataset.DoubleVariables);
     }
 
@@ -117 +114 @@
       } else {
         correlationTimeframCache.SetTimeframeCorrelation(e.Calculcator, e.Partition, e.Variable, e.Correlation);
-        SetNewCorrelation(e.Correlation, e.Calculcator);
+        SetNewCorrelation(e.Correlation);
         UpdateDataView();
       }