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

Timestamp:

11/08/12 12:10:38 (12 years ago)

Author:

sforsten

Message:

#1292: implemented changes suggested by mkommend in comment:49:ticket:1292

File:

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

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

@@ -73 +73 @@
 
     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 };
+      var indices = GetRelevantIndices(problemData, partition);
+      bwInfo = new BackgroundWorkerInfo {
+        Dataset = dataset, Calculator = calc, Partition = partition, Indices = indices,
+        Variable = variable, Frames = frames, AlreadyCalculated = alreadyCalculated
+      };
       if (bw == null) {
         bw = new BackgroundWorker();
@@ -89 +93 @@
     }
 
+    private IEnumerable<int> GetRelevantIndices(IDataAnalysisProblemData problemData, string partition) {
+      IEnumerable<int> var;
+      if (partition.Equals(AbstractFeatureCorrelationView.TRAININGSAMPLES))
+        var = problemData.TrainingIndices;
+      else if (partition.Equals(AbstractFeatureCorrelationView.TESTSAMPLES))
+        var = problemData.TestIndices;
+      else var = Enumerable.Range(0, problemData.Dataset.Rows);
+      return var;
+    }
+
     #region backgroundworker
     private void BwDoWork(object sender, DoWorkEventArgs e) {
@@ -104 +118 @@
       BackgroundWorkerInfo bwInfo = (BackgroundWorkerInfo)e.Argument;
       Dataset dataset = bwInfo.Dataset;
-      string partition = bwInfo.Partition;
+      IEnumerable<int> indices = bwInfo.Indices;
       IDependencyCalculator calc = bwInfo.Calculator;
 
@@ -122 +136 @@
             return;
           }
-          IEnumerable<double> var1 = GetRelevantValues(problemData, partition, doubleVariableNames[i]);
-          IEnumerable<double> var2 = GetRelevantValues(problemData, partition, doubleVariableNames[j]);
+          IEnumerable<double> var1 = problemData.Dataset.GetDoubleValues(doubleVariableNames[i], indices);
+          IEnumerable<double> var2 = problemData.Dataset.GetDoubleValues(doubleVariableNames[j], indices);
 
           elements[i, j] = calc.Calculate(var1, var2, out error);
@@ -143 +157 @@
       BackgroundWorkerInfo bwInfo = (BackgroundWorkerInfo)e.Argument;
       Dataset dataset = bwInfo.Dataset;
-      string partition = bwInfo.Partition;
+      IEnumerable<int> indices = bwInfo.Indices;
       IDependencyCalculator calc = bwInfo.Calculator;
       string variable = bwInfo.Variable;
@@ -173 +187 @@
           }
 
-          IEnumerable<double> var1 = GetRelevantValues(problemData, partition, variable);
-          IEnumerable<double> var2 = GetRelevantValues(problemData, partition, doubleVariableNames[i]);
+          IEnumerable<double> var1 = problemData.Dataset.GetDoubleValues(variable, indices);
+          IEnumerable<double> var2 = problemData.Dataset.GetDoubleValues(doubleVariableNames[i], indices);
 
           var valuesInFrame = var1.Take(j);
@@ -191 +205 @@
       e.Result = elements;
       worker.ReportProgress(100);
-    }
-
-    private IEnumerable<double> GetRelevantValues(IDataAnalysisProblemData problemData, string partition, string variable) {
-      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;
     }
 
@@ -254 +258 @@
       public IDependencyCalculator Calculator { get; set; }
       public string Partition { get; set; }
+      public IEnumerable<int> Indices { get; set; }
       public string Variable { get; set; }
       public int Frames { get; set; }