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

Timestamp:

11/07/12 13:44:33 (11 years ago)

Author:

mkommend

Message:

#1292: Minor code cleanup in feature correlation classes.

File:

• trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/FeatureCorrelation/FeatureCorrelationCalculator.cs (modified) (3 diffs)

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

@@ -70 +70 @@
         bw.CancelAsync();
       }
-    }
-
-    private double[,] GetElementsOfCorrelation(double[,] corr, int frames) {
-      double[,] elements = new double[corr.GetLength(0), frames + 1];
-      for (int i = 0; i < corr.GetLength(0); i++) {
-        for (int j = 0; j <= frames; j++) {
-          elements[i, j] = corr[i, j];
-        }
-      }
-      return elements;
     }
 
@@ -204 +194 @@
 
     private IEnumerable<double> GetRelevantValues(IDataAnalysisProblemData problemData, string partition, string variable) {
-      IEnumerable<double> var = problemData.Dataset.GetDoubleValues(variable);
-      if (partition.Equals(FeatureCorrelationPartitions.TRAININGSAMPLES)) {
-        var = var.Skip(problemData.TrainingPartition.Start).Take(problemData.TrainingPartition.End - problemData.TrainingPartition.Start);
-      } else if (partition.Equals(FeatureCorrelationPartitions.TESTSAMPLES)) {
-        var = var.Skip(problemData.TestPartition.Start).Take(problemData.TestPartition.End - problemData.TestPartition.Start);
-      }
+      IEnumerable<double> var;
+      if (partition.Equals(FeatureCorrelationPartitions.TRAININGSAMPLES))
+        var = problemData.Dataset.GetDoubleValues(variable, problemData.TrainingIndices);
+      else if (partition.Equals(FeatureCorrelationPartitions.TESTSAMPLES))
+        var = problemData.Dataset.GetDoubleValues(variable, problemData.TestIndices);
+      else var = problemData.Dataset.GetDoubleValues(variable);
       return var;
     }
@@ -216 +206 @@
       BackgroundWorker worker = sender as BackgroundWorker;
       if (!e.Cancelled && !worker.CancellationPending) {
-        if (!(e.Error == null)) {
+        if (e.Error != null) {
           ErrorHandling.ShowErrorDialog(e.Error);
         } else {