- Timestamp:
- 10/13/16 19:47:41 (8 years ago)
- Location:
- branches/symbreg-factors-2650
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/symbreg-factors-2650
- Property svn:mergeinfo changed
/trunk/sources merged: 14282,14284-14300,14307,14314-14316,14319,14322
- Property svn:mergeinfo changed
-
branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis.Views
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Problems.DataAnalysis.Views (added) merged: 14300,14307
- Property svn:mergeinfo changed
-
branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis.Views/3.4/FeatureCorrelation/TimeframeFeatureCorrelationCalculator.cs
r13938 r14330 72 72 } 73 73 74 var var1 = dataset.GetDoubleValues(variable, indices).ToArray(); 75 74 76 for (int i = 0; i < length; i++) { 75 77 for (int j = start; j <= frames; j++) { … … 80 82 } 81 83 82 IEnumerable<double> var1 = dataset.GetDoubleValues(variable, indices);83 84 IEnumerable<double> var2 = dataset.GetDoubleValues(doubleVariableNames[i], indices); 84 85 85 var valuesInFrame = var1.Take(j);86 var help = var1.Skip(j).ToList();87 help.AddRange(valuesInFrame);88 var1 = help;89 90 86 var error = OnlineCalculatorError.None; 91 elements[i, j] = calc.Calculate(var1 , var2, out error);87 elements[i, j] = calc.Calculate(var1.Skip(j), var2.Take(var1.Length-j), out error); 92 88 93 89 if (!error.Equals(OnlineCalculatorError.None)) { -
branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionTargetResponseGradientView.cs
r14277 r14330 125 125 126 126 if (sharedFixedVariables != null) 127 sharedFixedVariables.ItemChanged += SharedFixedVariables_ItemChanged;127 sharedFixedVariables.ItemChanged -= SharedFixedVariables_ItemChanged; 128 128 129 129 sharedFixedVariables = new ModifiableDataset(doubleVariables.Concat(factorVariables), doubleVariableValues.Concat(factorVariableValues));
Note: See TracChangeset
for help on using the changeset viewer.