Changeset 8863 for branches/ClassificationEnsembleVoting/HeuristicLab.Problems.DataAnalysis.Views/3.4/FeatureCorrelation/FeatureCorrelationCalculator.cs

Timestamp:

10/30/12 16:22:04 (12 years ago)

Author:

sforsten

Message:

#1776:

• merged r8810:8862 from trunk into branch
• fixed exception in ClassificationEnsembleSolutionAccuracyToCoveredSamples, if no estimated values are in a partition, so nothing can be shown

Location:

branches/ClassificationEnsembleVoting/HeuristicLab.Problems.DataAnalysis.Views

Files:

• . (modified) (1 prop)
• 3.4/FeatureCorrelation/FeatureCorrelationCalculator.cs (modified) (16 diffs)

branches/ClassificationEnsembleVoting/HeuristicLab.Problems.DataAnalysis.Views/3.4/FeatureCorrelation/FeatureCorrelationCalculator.cs

@@ -51 +51 @@
     }
 
-    public void CalculateElements(FeatureCorrelationEnums.CorrelationCalculators calc, FeatureCorrelationEnums.Partitions partition) {
+    public void CalculateElements(IDependencyCalculator calc, string partition) {
       CalculateElements(problemData.Dataset, calc, partition);
     }
 
-    // returns if any calculation takes place
-    public bool CalculateTimeframeElements(FeatureCorrelationEnums.CorrelationCalculators calc, FeatureCorrelationEnums.Partitions partition, string variable, int frames, double[,] correlation = null) {
+    // returns true if any calculation takes place
+    public bool CalculateTimeframeElements(IDependencyCalculator calc, string partition, string variable, int frames, double[,] correlation = null) {
       if (correlation == null || correlation.GetLength(1) <= frames) {
         CalculateElements(problemData.Dataset, calc, partition, variable, frames, correlation);
@@ -65 +65 @@
     }
 
+    public void TryCancelCalculation() {
+      if (bw != null && bw.IsBusy) {
+        bwInfo = null;
+        bw.CancelAsync();
+      }
+    }
+
     private double[,] GetElementsOfCorrelation(double[,] corr, int frames) {
       double[,] elements = new double[corr.GetLength(0), frames + 1];
@@ -75 +82 @@
     }
 
-    private void CalculateElements(Dataset dataset, FeatureCorrelationEnums.CorrelationCalculators calc, FeatureCorrelationEnums.Partitions partition, string variable = null, int frames = 0, double[,] alreadyCalculated = null) {
+    private void CalculateElements(Dataset dataset, IDependencyCalculator calc, string 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 +114 @@
       BackgroundWorkerInfo bwInfo = (BackgroundWorkerInfo)e.Argument;
       Dataset dataset = bwInfo.Dataset;
-      FeatureCorrelationEnums.Partitions partition = bwInfo.Partition;
-      FeatureCorrelationEnums.CorrelationCalculators calc = bwInfo.Calculator;
+      string partition = bwInfo.Partition;
+      IDependencyCalculator calc = bwInfo.Calculator;
 
       IList<string> doubleVariableNames = dataset.DoubleVariables.ToList();
@@ -121 +128 @@
         for (int j = 0; j < i + 1; j++) {
           if (worker.CancellationPending) {
+            worker.ReportProgress(100);
             e.Cancel = true;
             return;
@@ -127 +135 @@
           IEnumerable<double> var2 = GetRelevantValues(problemData, partition, doubleVariableNames[j]);
 
-          elements[i, j] = CalculateElementWithCalculator(calc, var1, var2, out error);
+          elements[i, j] = calc.Calculate(var1, var2, out error);
 
           if (!error.Equals(OnlineCalculatorError.None)) {
@@ -137 +145 @@
       }
       e.Result = elements;
+      worker.ReportProgress(100);
     }
 
@@ -144 +153 @@
       BackgroundWorkerInfo bwInfo = (BackgroundWorkerInfo)e.Argument;
       Dataset dataset = bwInfo.Dataset;
-      FeatureCorrelationEnums.Partitions partition = bwInfo.Partition;
-      FeatureCorrelationEnums.CorrelationCalculators calc = bwInfo.Calculator;
+      string partition = bwInfo.Partition;
+      IDependencyCalculator calc = bwInfo.Calculator;
       string variable = bwInfo.Variable;
       int frames = bwInfo.Frames;
@@ -169 +178 @@
         for (int j = start; j <= frames; j++) {
           if (worker.CancellationPending) {
+            worker.ReportProgress(100);
             e.Cancel = true;
             return;
@@ -181 +191 @@
           var1 = help;
 
-          elements[i, j] = CalculateElementWithCalculator(calc, var1, var2, out error);
+          elements[i, j] = calc.Calculate(var1, var2, out error);
 
           if (!error.Equals(OnlineCalculatorError.None)) {
@@ -190 +200 @@
       }
       e.Result = elements;
-    }
-
-    private IEnumerable<double> GetRelevantValues(IDataAnalysisProblemData problemData, FeatureCorrelationEnums.Partitions partition, string variable) {
+      worker.ReportProgress(100);
+    }
+
+    private IEnumerable<double> GetRelevantValues(IDataAnalysisProblemData problemData, string partition, string variable) {
       IEnumerable<double> var = problemData.Dataset.GetDoubleValues(variable);
-      if (partition.Equals(FeatureCorrelationEnums.Partitions.TrainingSamples)) {
+      if (partition.Equals(FeatureCorrelationPartitions.TRAININGSAMPLES)) {
         var = var.Skip(problemData.TrainingPartition.Start).Take(problemData.TrainingPartition.End - problemData.TrainingPartition.Start);
-      } else if (partition.Equals(FeatureCorrelationEnums.Partitions.TestSamples)) {
+      } else if (partition.Equals(FeatureCorrelationPartitions.TESTSAMPLES)) {
         var = var.Skip(problemData.TestPartition.Start).Take(problemData.TestPartition.End - problemData.TestPartition.Start);
       }
       return var;
-    }
-
-    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(FeatureCorrelationEnums.CorrelationCalculators.SpearmansRank)) {
-        return SpearmansRankCorrelationCoefficientCalculator.Calculate(var1, var2, out error);
-      } else if (calc.Equals(FeatureCorrelationEnums.CorrelationCalculators.PearsonsRSquared)) {
-        return OnlinePearsonsRSquaredCalculator.Calculate(var1, var2, out error);
-      } else {
-        return Math.Sqrt(OnlinePearsonsRSquaredCalculator.Calculate(var1, var2, out error));
-      }
     }
 
@@ -222 +221 @@
           OnCorrelationCalculationFinished((double[,])e.Result, bwInfo.Calculator, bwInfo.Partition, bwInfo.Variable);
         }
-      } else {
+      } else if (bwInfo != null) {
         bw.RunWorkerAsync(bwInfo);
       }
@@ -231 +230 @@
     public class CorrelationCalculationFinishedArgs : EventArgs {
       public double[,] Correlation { get; private set; }
-      public FeatureCorrelationEnums.CorrelationCalculators Calculcator { get; private set; }
-      public FeatureCorrelationEnums.Partitions Partition { get; private set; }
+      public IDependencyCalculator Calculcator { get; private set; }
+      public string Partition { get; private set; }
       public string Variable { get; private set; }
 
-      public CorrelationCalculationFinishedArgs(double[,] correlation, FeatureCorrelationEnums.CorrelationCalculators calculator, FeatureCorrelationEnums.Partitions partition, string variable = null) {
+      public CorrelationCalculationFinishedArgs(double[,] correlation, IDependencyCalculator calculator, string partition, string variable = null) {
         this.Correlation = correlation;
         this.Calculcator = calculator;
@@ -245 +244 @@
     public delegate void CorrelationCalculationFinishedHandler(object sender, CorrelationCalculationFinishedArgs e);
     public event CorrelationCalculationFinishedHandler CorrelationCalculationFinished;
-    protected virtual void OnCorrelationCalculationFinished(double[,] correlation, FeatureCorrelationEnums.CorrelationCalculators calculator, FeatureCorrelationEnums.Partitions partition, string variable = null) {
+    protected virtual void OnCorrelationCalculationFinished(double[,] correlation, IDependencyCalculator calculator, string partition, string variable = null) {
       var handler = CorrelationCalculationFinished;
       if (handler != null)
@@ -255 +254 @@
     protected void BwProgressChanged(object sender, ProgressChangedEventArgs e) {
       BackgroundWorker worker = sender as BackgroundWorker;
-      if (!worker.CancellationPending && ProgressCalculation != null) {
+      if (ProgressCalculation != null) {
         ProgressCalculation(sender, e);
       }
@@ -263 +262 @@
     private class BackgroundWorkerInfo {
       public Dataset Dataset { get; set; }
-      public FeatureCorrelationEnums.CorrelationCalculators Calculator { get; set; }
-      public FeatureCorrelationEnums.Partitions Partition { get; set; }
+      public IDependencyCalculator Calculator { get; set; }
+      public string Partition { get; set; }
       public string Variable { get; set; }
       public int Frames { get; set; }