Changeset 8483 for branches/DatasetFeatureCorrelation/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/FeatureCorrelation.cs

Timestamp:

08/14/12 13:05:48 (12 years ago)

Author:

sforsten

Message:

#1292:

• Renamed ExtendedHeatMap to FeatureCorrelation
• deleted old CorrelationHeatMapView
• added FeatureCorrelationView

File:

• branches/DatasetFeatureCorrelation/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/FeatureCorrelation.cs (moved) (moved from branches/DatasetFeatureCorrelation/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/ExtendedHeatMap.cs) (8 diffs)

branches/DatasetFeatureCorrelation/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/FeatureCorrelation.cs

@@ -33 +33 @@
 namespace HeuristicLab.Problems.DataAnalysis {
   [StorableClass]
-  [Item("HeatMap", "Represents a heat map of double values.")]
-  public class ExtendedHeatMap : HeatMap {
-
-    private const string PrearsonsRSquared = "Pearsons R Squared";
+  [Item("FeatureCorrelation", "Represents the correlation of features in a data set.")]
+  public class FeatureCorrelation : HeatMap {
+
+    private const string PearsonsR = "Pearsons R";
+    private const string PearsonsRSquared = "Pearsons R Squared";
     private const string HoeffdingsDependence = "Hoeffdings Dependence";
     private const string SpearmansRank = "Spearmans Rank";
     public IEnumerable<string> CorrelationCalculators {
-      get { return new List<string>() { PrearsonsRSquared, HoeffdingsDependence, SpearmansRank }; }
+      get { return new List<string>() { PearsonsR, PearsonsRSquared, HoeffdingsDependence, SpearmansRank }; }
     }
 
@@ -65 +66 @@
     private BackgroundWorker bw;
 
-    public ExtendedHeatMap()
+    public FeatureCorrelation()
       : base() {
       this.Title = "Feature Correlation";
       this.columnNames = Enumerable.Range(1, 2).Select(x => x.ToString()).ToList();
       this.rowNames = Enumerable.Range(1, 2).Select(x => x.ToString()).ToList();
-    }
-
-    public ExtendedHeatMap(IDataAnalysisProblemData problemData) {
+      sortableView = true;
+    }
+
+    public FeatureCorrelation(IDataAnalysisProblemData problemData) {
       this.problemData = problemData;
       this.Title = "Feature Correlation";
       this.columnNames = problemData.Dataset.DoubleVariables.ToList();
       this.rowNames = problemData.Dataset.DoubleVariables.ToList();
+      sortableView = true;
 
       CalculateElements(problemData.Dataset);
     }
-    protected ExtendedHeatMap(ExtendedHeatMap original, Cloner cloner)
+    protected FeatureCorrelation(FeatureCorrelation original, Cloner cloner)
       : base(original, cloner) {
       this.Title = "Feature Correlation";
@@ -88 +91 @@
     }
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new ExtendedHeatMap(this, cloner);
+      return new FeatureCorrelation(this, cloner);
     }
 
@@ -112 +115 @@
       }
       bw.RunWorkerAsync(new BackgroundWorkerInfo { Dataset = dataset, Calculator = calc, Partition = partition });
+      if (calc.Equals(PearsonsR) || calc.Equals(SpearmansRank)) {
+        Maximum = 1.0;
+        Minimum = -1.0;
+      } else if (calc.Equals(HoeffdingsDependence)) {
+        Maximum = 1.0;
+        Minimum = -0.5;
+      } else {
+        Maximum = 1.0;
+        Minimum = 0.0;
+      }
     }
 
@@ -128 +141 @@
 
       double calculations = (Math.Pow(length, 2) + length) / 2;
+
+      worker.ReportProgress(0);
 
       for (int i = 0; i < length; i++) {
@@ -150 +165 @@
           } else if (calc.Equals(SpearmansRank)) {
             elements[i, j] = SpearmansRankCorrelationCoefficientCalculator.Calculate(var1, var2, out error);
+          } else if (calc.Equals(PearsonsRSquared)) {
+            elements[i, j] = OnlinePearsonsRSquaredCalculator.Calculate(var1, var2, out error);
           } else {
-            elements[i, j] = OnlinePearsonsRSquaredCalculator.Calculate(var1, var2, out error);
+            elements[i, j] = OnlinePearsonsRSquaredCalculator.CalculateR(var1, var2, out error);
           }
           elements[j, i] = elements[i, j];
           if (!error.Equals(OnlineCalculatorError.None)) {
-            throw new ArgumentException("Calculator returned " + error);
+            worker.ReportProgress(100);
+            throw new ArgumentException("Calculator returned " + error + Environment.NewLine + "Maybe try another calculator.");
           }
           worker.ReportProgress((int)Math.Round((((Math.Pow(i, 2) + i) / 2 + j + 1.0) / calculations) * 100));
@@ -172 +190 @@
           OnReset();
         }
-      } else {
-        Console.WriteLine("Backgroundworker canceled");
       }
     }
@@ -189 +205 @@
     public event EventHandler ProblemDataChanged;
     protected virtual void OnProblemDataChanged() {
-      var handler = ProblemDataChanged;
-      if (handler != null) handler(this, EventArgs.Empty);
+      EventHandler handler = ProblemDataChanged;
+      if (handler != null)
+        handler(this, EventArgs.Empty);
     }
     #endregion