Changeset 8833 for trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/OnlineCalculators

Timestamp:

10/23/12 10:07:48 (12 years ago)

Author:

sforsten

Message:

#1292:

• removed combo box in TimeframeCorrelationView and added a textbox instead
• caches are directly in (Timeframe-)FeatureCorrelationView
• caches use Tuple<> instead of nested dictionaries
• a control EnhancedStringConvertibleMatrix inherits from StringConvertibleMatrixView to reduce code duplication
• add interface IDependencyCalculator to several calculators
• fixed bug: a previous started calculation is cancelled, if a new calculation shall be started and the values are already in the cache
• fixed bug: if the content is changed, the calculation is cancelled

HeatMap is still used for the dependency representation, because a class is needed which implements IStringConvertibleMatrix and it has a maximum and minimum value.

Location:

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/OnlineCalculators

Files:

• HoeffdingsDependenceCalculator.cs (modified) (1 diff)
• PearsonsRDependenceCalculator.cs (added)
• PearsonsRSquaredDependenceCalculator.cs (added)
• SpearmansRankCorrelationCoefficientCalculator.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/OnlineCalculators/HoeffdingsDependenceCalculator.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Linq;
+using HeuristicLab.Data;
 
 namespace HeuristicLab.Problems.DataAnalysis {
-  public class HoeffdingsDependenceCalculator {
+  public class HoeffdingsDependenceCalculator : IDependencyCalculator {
 
-    public static double Calculate(IEnumerable<double> originalValues, IEnumerable<double> estimatedValues, out OnlineCalculatorError errorState) {
+    public DoubleRange Interval { get { return new DoubleRange(1.0, -0.5); } }
+
+    public string Name { get { return "Hoeffdings Dependence"; } }
+
+    public double Calculate(IEnumerable<double> originalValues, IEnumerable<double> estimatedValues, out OnlineCalculatorError errorState) {
+      return HoeffdingsDependenceCalculator.CalculateHoeffdings(originalValues, estimatedValues, out errorState);
+    }
+
+    public static double CalculateHoeffdings(IEnumerable<double> originalValues, IEnumerable<double> estimatedValues, out OnlineCalculatorError errorState) {
       double d = HoeffD(originalValues, estimatedValues, out errorState);
       if (errorState != OnlineCalculatorError.None) return double.NaN;

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/OnlineCalculators/SpearmansRankCorrelationCoefficientCalculator.cs

@@ -22 +22 @@
 using System.Collections.Generic;
 using System.Linq;
+using HeuristicLab.Data;
 
 namespace HeuristicLab.Problems.DataAnalysis {
-  public class SpearmansRankCorrelationCoefficientCalculator {
+  public class SpearmansRankCorrelationCoefficientCalculator : IDependencyCalculator {
 
-    public static double Calculate(IEnumerable<double> originalValues, IEnumerable<double> estimatedValues, out OnlineCalculatorError errorState) {
+    public DoubleRange Interval { get { return new DoubleRange(1.0, -1.0); } }
+
+    public string Name { get { return "Spearmans Rank"; } }
+
+    public double Calculate(IEnumerable<double> originalValues, IEnumerable<double> estimatedValues, out OnlineCalculatorError errorState) {
+      return SpearmansRankCorrelationCoefficientCalculator.CalculateSpearmansRank(originalValues, estimatedValues, out errorState);
+    }
+
+    public static double CalculateSpearmansRank(IEnumerable<double> originalValues, IEnumerable<double> estimatedValues, out OnlineCalculatorError errorState) {
       double rs = double.NaN;
       try {