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

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

Location:

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4

Files:

• HeuristicLab.Problems.DataAnalysis-3.4.csproj (modified) (2 diffs)
• Interfaces/IDependencyCalculator.cs (modified) (1 diff)
• OnlineCalculators/DependencyCalculator (added)
• OnlineCalculators/DependencyCalculator/HoeffdingsDependenceCalculator.cs (moved) (moved from trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/OnlineCalculators/HoeffdingsDependenceCalculator.cs) (1 diff)
• OnlineCalculators/DependencyCalculator/PearsonsRDependenceCalculator.cs (moved) (moved from trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/OnlineCalculators/PearsonsRDependenceCalculator.cs) (1 diff)
• OnlineCalculators/DependencyCalculator/PearsonsRSquaredDependenceCalculator.cs (moved) (moved from trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/OnlineCalculators/PearsonsRSquaredDependenceCalculator.cs) (1 diff)
• OnlineCalculators/DependencyCalculator/SpearmansRankCorrelationCoefficientCalculator.cs (moved) (moved from trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/OnlineCalculators/SpearmansRankCorrelationCoefficientCalculator.cs) (1 diff)

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/HeuristicLab.Problems.DataAnalysis-3.4.csproj

@@ -164 +164 @@
     <Compile Include="Interfaces\TimeSeriesPrognosis\ITimeSeriesPrognosisSolution.cs" />
     <Compile Include="OnlineCalculators\AutoCorrelationCalculator.cs" />
+    <Compile Include="OnlineCalculators\DependencyCalculator\HoeffdingsDependenceCalculator.cs" />
+    <Compile Include="OnlineCalculators\DependencyCalculator\PearsonsRDependenceCalculator.cs" />
+    <Compile Include="OnlineCalculators\DependencyCalculator\PearsonsRSquaredDependenceCalculator.cs" />
+    <Compile Include="OnlineCalculators\DependencyCalculator\SpearmansRankCorrelationCoefficientCalculator.cs" />
     <Compile Include="OnlineCalculators\OnlineBoundedMeanSquaredErrorCalculator.cs" />
-    <Compile Include="OnlineCalculators\HoeffdingsDependenceCalculator.cs" />
     <Compile Include="OnlineCalculators\OnlineDirectionalSymmetryCalculator.cs" />
     <Compile Include="OnlineCalculators\OnlineMaxAbsoluteErrorCalculator.cs" />
@@ -207 +210 @@
     <Compile Include="OnlineCalculators\OnlineTheilsUStatisticCalculator.cs" />
     <Compile Include="OnlineCalculators\OnlineWeightedDirectionalSymmetryCalculator.cs" />
-    <Compile Include="OnlineCalculators\PearsonsRDependenceCalculator.cs" />
-    <Compile Include="OnlineCalculators\PearsonsRSquaredDependenceCalculator.cs" />
-    <Compile Include="OnlineCalculators\SpearmansRankCorrelationCoefficientCalculator.cs" />
     <Compile Include="Plugin.cs" />
     <Compile Include="Implementation\Classification\ThresholdCalculators\AccuracyMaximizationThresholdCalculator.cs" />

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/IDependencyCalculator.cs

@@ -21 +21 @@
 
 using System.Collections.Generic;
-using HeuristicLab.Data;
 
 namespace HeuristicLab.Problems.DataAnalysis {
   public interface IDependencyCalculator {
-    DoubleRange Interval { get; }
+    double Maximum { get; }
+    double Minimum { get; }
     string Name { get; }
 

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

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Linq;
-using HeuristicLab.Data;
 
 namespace HeuristicLab.Problems.DataAnalysis {
   public class HoeffdingsDependenceCalculator : IDependencyCalculator {
 
-    public DoubleRange Interval { get { return new DoubleRange(1.0, -0.5); } }
+    public double Maximum { get { return 1.0; } }
+
+    public double Minimum { get { return -0.5; } }
 
     public string Name { get { return "Hoeffdings Dependence"; } }

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/OnlineCalculators/DependencyCalculator/PearsonsRDependenceCalculator.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
-using HeuristicLab.Data;
 
 namespace HeuristicLab.Problems.DataAnalysis {
   public class PearsonsRDependenceCalculator : IDependencyCalculator {
 
-    public DoubleRange Interval { get { return new DoubleRange(1.0, -1.0); } }
+    public double Maximum { get { return 1.0; } }
+
+    public double Minimum { get { return -1.0; } }
 
     public string Name { get { return "Pearsons R"; } }

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/OnlineCalculators/DependencyCalculator/PearsonsRSquaredDependenceCalculator.cs

@@ -21 +21 @@
 
 using System.Collections.Generic;
-using HeuristicLab.Data;
 
 namespace HeuristicLab.Problems.DataAnalysis {
   public class PearsonsRSquaredDependenceCalculator : IDependencyCalculator {
 
-    public DoubleRange Interval { get { return new DoubleRange(1.0, 0.0); } }
+    public double Maximum { get { return 1.0; } }
+
+    public double Minimum { get { return 0.0; } }
 
     public string Name { get { return "Pearsons R Squared"; } }

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

@@ -22 +22 @@
 using System.Collections.Generic;
 using System.Linq;
-using HeuristicLab.Data;
 
 namespace HeuristicLab.Problems.DataAnalysis {
   public class SpearmansRankCorrelationCoefficientCalculator : IDependencyCalculator {
 
-    public DoubleRange Interval { get { return new DoubleRange(1.0, -1.0); } }
+    public double Maximum { get { return 1.0; } }
+
+    public double Minimum { get { return -1.0; } }
 
     public string Name { get { return "Spearmans Rank"; } }