Changeset 8729 for trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/FeatureCorrelation/FeatureCorrelationCalculator.cs

Timestamp:

10/04/12 11:43:16 (12 years ago)

Author:

mkommend

Message:

#1292: Moved FeatureCorrelation specific classes from Problems.DataAnalysis to Problems.DataAnalysis.Views.

File:

• trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/FeatureCorrelation/FeatureCorrelationCalculator.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/FeatureCorrelation/FeatureCorrelationCalculator.cs) (10 diffs)

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

@@ -25 +25 @@
 using System.Linq;
 using HeuristicLab.PluginInfrastructure;
-using FCE = HeuristicLab.Problems.DataAnalysis.FeatureCorrelationEnums;
-
-namespace HeuristicLab.Problems.DataAnalysis {
+
+namespace HeuristicLab.Problems.DataAnalysis.Views {
+  [NonDiscoverableType]
   public class FeatureCorrelationCalculator : Object {
 
@@ -51 +51 @@
     }
 
-    public void CalculateElements(FCE.CorrelationCalculators calc, FCE.Partitions partition) {
+    public void CalculateElements(FeatureCorrelationEnums.CorrelationCalculators calc, FeatureCorrelationEnums.Partitions partition) {
       CalculateElements(problemData.Dataset, calc, partition);
     }
 
     // returns if any calculation takes place
-    public bool CalculateTimeframeElements(FCE.CorrelationCalculators calc, FCE.Partitions partition, string variable, int frames, double[,] correlation = null) {
+    public bool CalculateTimeframeElements(FeatureCorrelationEnums.CorrelationCalculators calc, FeatureCorrelationEnums.Partitions partition, string variable, int frames, double[,] correlation = null) {
       if (correlation == null || correlation.GetLength(1) <= frames) {
         CalculateElements(problemData.Dataset, calc, partition, variable, frames, correlation);
@@ -75 +75 @@
     }
 
-    private void CalculateElements(Dataset dataset, FCE.CorrelationCalculators calc, FCE.Partitions partition, string variable = null, int frames = 0, double[,] alreadyCalculated = null) {
+    private void CalculateElements(Dataset dataset, FeatureCorrelationEnums.CorrelationCalculators calc, FeatureCorrelationEnums.Partitions partition, string variable = null, int frames = 0, double[,] alreadyCalculated = null) {
       bwInfo = new BackgroundWorkerInfo { Dataset = dataset, Calculator = calc, Partition = partition, Variable = variable, Frames = frames, AlreadyCalculated = alreadyCalculated };
       if (bw == null) {
@@ -107 +107 @@
       BackgroundWorkerInfo bwInfo = (BackgroundWorkerInfo)e.Argument;
       Dataset dataset = bwInfo.Dataset;
-      FCE.Partitions partition = bwInfo.Partition;
-      FCE.CorrelationCalculators calc = bwInfo.Calculator;
+      FeatureCorrelationEnums.Partitions partition = bwInfo.Partition;
+      FeatureCorrelationEnums.CorrelationCalculators calc = bwInfo.Calculator;
 
       IList<string> doubleVariableNames = dataset.DoubleVariables.ToList();
@@ -144 +144 @@
       BackgroundWorkerInfo bwInfo = (BackgroundWorkerInfo)e.Argument;
       Dataset dataset = bwInfo.Dataset;
-      FCE.Partitions partition = bwInfo.Partition;
-      FCE.CorrelationCalculators calc = bwInfo.Calculator;
+      FeatureCorrelationEnums.Partitions partition = bwInfo.Partition;
+      FeatureCorrelationEnums.CorrelationCalculators calc = bwInfo.Calculator;
       string variable = bwInfo.Variable;
       int frames = bwInfo.Frames;
@@ -192 +192 @@
     }
 
-    private IEnumerable<double> GetRelevantValues(IDataAnalysisProblemData problemData, FCE.Partitions partition, string variable) {
+    private IEnumerable<double> GetRelevantValues(IDataAnalysisProblemData problemData, FeatureCorrelationEnums.Partitions partition, string variable) {
       IEnumerable<double> var = problemData.Dataset.GetDoubleValues(variable);
-      if (partition.Equals(FCE.Partitions.TrainingSamples)) {
+      if (partition.Equals(FeatureCorrelationEnums.Partitions.TrainingSamples)) {
         var = var.Skip(problemData.TrainingPartition.Start).Take(problemData.TrainingPartition.End - problemData.TrainingPartition.Start);
-      } else if (partition.Equals(FCE.Partitions.TestSamples)) {
+      } else if (partition.Equals(FeatureCorrelationEnums.Partitions.TestSamples)) {
         var = var.Skip(problemData.TestPartition.Start).Take(problemData.TestPartition.End - problemData.TestPartition.Start);
       }
@@ -202 +202 @@
     }
 
-    private double CalculateElementWithCalculator(FCE.CorrelationCalculators calc, IEnumerable<double> var1, IEnumerable<double> var2, out OnlineCalculatorError error) {
-      if (calc.Equals(FCE.CorrelationCalculators.HoeffdingsDependence)) {
+    private double CalculateElementWithCalculator(FeatureCorrelationEnums.CorrelationCalculators calc, IEnumerable<double> var1, IEnumerable<double> var2, out OnlineCalculatorError error) {
+      if (calc.Equals(FeatureCorrelationEnums.CorrelationCalculators.HoeffdingsDependence)) {
         return HoeffdingsDependenceCalculator.Calculate(var1, var2, out error);
-      } else if (calc.Equals(FCE.CorrelationCalculators.SpearmansRank)) {
+      } else if (calc.Equals(FeatureCorrelationEnums.CorrelationCalculators.SpearmansRank)) {
         return SpearmansRankCorrelationCoefficientCalculator.Calculate(var1, var2, out error);
-      } else if (calc.Equals(FCE.CorrelationCalculators.PearsonsRSquared)) {
+      } else if (calc.Equals(FeatureCorrelationEnums.CorrelationCalculators.PearsonsRSquared)) {
         return OnlinePearsonsRSquaredCalculator.Calculate(var1, var2, out error);
       } else {
@@ -231 +231 @@
     public class CorrelationCalculationFinishedArgs : EventArgs {
       public double[,] Correlation { get; private set; }
-      public FCE.CorrelationCalculators Calculcator { get; private set; }
-      public FCE.Partitions Partition { get; private set; }
+      public FeatureCorrelationEnums.CorrelationCalculators Calculcator { get; private set; }
+      public FeatureCorrelationEnums.Partitions Partition { get; private set; }
       public string Variable { get; private set; }
 
-      public CorrelationCalculationFinishedArgs(double[,] correlation, FCE.CorrelationCalculators calculator, FCE.Partitions partition, string variable = null) {
+      public CorrelationCalculationFinishedArgs(double[,] correlation, FeatureCorrelationEnums.CorrelationCalculators calculator, FeatureCorrelationEnums.Partitions partition, string variable = null) {
         this.Correlation = correlation;
         this.Calculcator = calculator;
@@ -242 +242 @@
       }
     }
+
     public delegate void CorrelationCalculationFinishedHandler(object sender, CorrelationCalculationFinishedArgs e);
     public event CorrelationCalculationFinishedHandler CorrelationCalculationFinished;
-    protected virtual void OnCorrelationCalculationFinished(double[,] correlation, FCE.CorrelationCalculators calculator, FCE.Partitions partition, string variable = null) {
+    protected virtual void OnCorrelationCalculationFinished(double[,] correlation, FeatureCorrelationEnums.CorrelationCalculators calculator, FeatureCorrelationEnums.Partitions partition, string variable = null) {
       var handler = CorrelationCalculationFinished;
       if (handler != null)
@@ -260 +261 @@
     #endregion
 
-    protected class BackgroundWorkerInfo {
+    private class BackgroundWorkerInfo {
       public Dataset Dataset { get; set; }
-      public FCE.CorrelationCalculators Calculator { get; set; }
-      public FCE.Partitions Partition { get; set; }
+      public FeatureCorrelationEnums.CorrelationCalculators Calculator { get; set; }
+      public FeatureCorrelationEnums.Partitions Partition { get; set; }
       public string Variable { get; set; }
       public int Frames { get; set; }