Changeset 8542 for trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/Implementation

Timestamp:

08/30/12 11:47:47 (12 years ago)

Author:

mkommend

Message:

#1292: Integrated correlation analysis of datasets in the trunk.

Location:

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

Files:

• DataAnalysisProblemData.cs (modified) (5 diffs)
• FeatureCorrelation.cs (copied) (copied from branches/DatasetFeatureCorrelation/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/FeatureCorrelation.cs) (5 diffs)

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/DataAnalysisProblemData.cs

@@ -37 +37 @@
     protected const string TrainingPartitionParameterName = "TrainingPartition";
     protected const string TestPartitionParameterName = "TestPartition";
+    protected const string DatasetCorrelationParameterName = "Dataset Correlation";
 
     #region parameter properites
@@ -50 +51 @@
     public IFixedValueParameter<IntRange> TestPartitionParameter {
       get { return (IFixedValueParameter<IntRange>)Parameters[TestPartitionParameterName]; }
+    }
+    public IFixedValueParameter<FeatureCorrelation> DatasetCorrelationParameter {
+      get { return (IFixedValueParameter<FeatureCorrelation>)Parameters[DatasetCorrelationParameterName]; }
     }
     #endregion
@@ -73 +77 @@
     public IntRange TestPartition {
       get { return TestPartitionParameter.Value; }
+    }
+    public FeatureCorrelation DatasetCorrelation {
+      get { return DatasetCorrelationParameter.Value; }
     }
 
@@ -107 +114 @@
     [StorableConstructor]
     protected DataAnalysisProblemData(bool deserializing) : base(deserializing) { }
+
     [StorableHook(HookType.AfterDeserialization)]
     private void AfterDeserialization() {
       RegisterEventHandlers();
+      #region Backwards compatible code, remove with 3.4
+      if (!Parameters.ContainsKey(DatasetCorrelationParameterName)) {
+        Parameters.Add(new FixedValueParameter<FeatureCorrelation>(DatasetCorrelationParameterName, "", new FeatureCorrelation(this)));
+      }
+      #endregion
     }
 
@@ -132 +145 @@
       Parameters.Add(new FixedValueParameter<IntRange>(TrainingPartitionParameterName, "", new IntRange(trainingPartitionStart, trainingPartitionEnd)));
       Parameters.Add(new FixedValueParameter<IntRange>(TestPartitionParameterName, "", new IntRange(testPartitionStart, testPartitionEnd)));
+      Parameters.Add(new FixedValueParameter<FeatureCorrelation>(DatasetCorrelationParameterName, "", new FeatureCorrelation(this)));
 
       ((ValueParameter<Dataset>)DatasetParameter).ReactOnValueToStringChangedAndValueItemImageChanged = false;

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/FeatureCorrelation.cs

@@ -35 +35 @@
   [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";
@@ -52 +51 @@
 
     private IDataAnalysisProblemData problemData;
+    [Storable]
     public IDataAnalysisProblemData ProblemData {
       get { return problemData; }
@@ -67 +67 @@
     private BackgroundWorkerInfo bwInfo;
 
-    public FeatureCorrelation()
+    public FeatureCorrelation() {
+      this.Title = "Feature Correlation";
+      this.columnNames = problemData.Dataset.DoubleVariables.ToList();
+      this.rowNames = problemData.Dataset.DoubleVariables.ToList();
+      sortableView = true;
+    }
+    public FeatureCorrelation(IDataAnalysisProblemData problemData)
       : 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();
-      sortableView = true;
-    }
-
-    public FeatureCorrelation(IDataAnalysisProblemData problemData) {
       this.problemData = problemData;
       this.Title = "Feature Correlation";
@@ -84 +83 @@
     protected FeatureCorrelation(FeatureCorrelation original, Cloner cloner)
       : base(original, cloner) {
-      this.Title = "Feature Correlation";
-      this.problemData = original.problemData;
-      this.columnNames = original.problemData.Dataset.DoubleVariables.ToList();
-      this.rowNames = original.problemData.Dataset.DoubleVariables.ToList();
+      this.problemData = cloner.Clone(original.problemData);
     }
     public override IDeepCloneable Clone(Cloner cloner) {
       return new FeatureCorrelation(this, cloner);
     }
+
+    [StorableConstructor]
+    protected FeatureCorrelation(bool deserializing) : base(deserializing) { }
 
     public void Recalculate(string calc, string partition) {
@@ -244 +243 @@
         return OnlinePearsonsRSquaredCalculator.Calculate(var1, var2, out error);
       } else {
-        return OnlinePearsonsRSquaredCalculator.CalculateR(var1, var2, out error);
+        return Math.Sqrt(OnlinePearsonsRSquaredCalculator.Calculate(var1, var2, out error));
       }
     }