Changeset 14318 for stable

Timestamp:

10/02/16 11:34:27 (8 years ago)

Author:

gkronber

Message:

#2675: merged bug fix r14300 from trunk to stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Views (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/FeatureCorrelation/TimeframeFeatureCorrelationCalculator.cs (modified) (2 diffs)

stable/HeuristicLab.Problems.DataAnalysis.Views/3.4/FeatureCorrelation/TimeframeFeatureCorrelationCalculator.cs

@@ -72 +72 @@
       }
 
+      var var1 = dataset.GetDoubleValues(variable, indices).ToArray();
+
       for (int i = 0; i < length; i++) {
         for (int j = start; j <= frames; j++) {
@@ -80 +82 @@
           }
 
-          IEnumerable<double> var1 = dataset.GetDoubleValues(variable, indices);
           IEnumerable<double> var2 = dataset.GetDoubleValues(doubleVariableNames[i], indices);
 
-          var valuesInFrame = var1.Take(j);
-          var help = var1.Skip(j).ToList();
-          help.AddRange(valuesInFrame);
-          var1 = help;
-
           var error = OnlineCalculatorError.None;
-          elements[i, j] = calc.Calculate(var1, var2, out error);
+          elements[i, j] = calc.Calculate(var1.Skip(j), var2.Take(var1.Length-j), out error);
 
           if (!error.Equals(OnlineCalculatorError.None)) {