Changeset 16051 for branches/2904_CalculateImpacts/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionVariableImpactsView.cs
- Timestamp:
- 08/06/18 16:16:51 (6 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2904_CalculateImpacts/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionVariableImpactsView.cs
r16042 r16051 141 141 142 142 rawVariableImpacts.Clear(); 143 originalVariableOrdering.ForEach(v => rawVariableImpacts.Add(new Tuple<string, double>(v, impacts.First(vv => vv.Item1 == v).Item2)));143 rawVariableImpacts.AddRange(impacts); 144 144 UpdateOrdering(); 145 145 } … … 164 164 165 165 //Calculate original quality-values (via calculator, default is R²) 166 OnlineCalculatorError error;167 166 IEnumerable<double> targetValuesPartition = problemData.Dataset.GetDoubleValues(problemData.TargetVariable, rows); 168 167 IEnumerable<double> estimatedValuesPartition = Content.GetEstimatedValues(rows); 169 168 170 var originalCalculatorValue = RegressionSolutionVariableImpactsCalculator.CalculateVariableImpact(targetValuesPartition, estimatedValuesPartition, out error); 171 if (error != OnlineCalculatorError.None) throw new InvalidOperationException("Error during calculation."); 169 var originalCalculatorValue = RegressionSolutionVariableImpactsCalculator.CalculateQuality(targetValuesPartition, estimatedValuesPartition); 172 170 173 171 foreach (var variableName in originalVariableOrdering) { … … 179 177 //If the variable isn't used for prediction, it has zero impact. 180 178 if (model.VariablesUsedForPrediction.Contains(variableName)) { 181 impact = RegressionSolutionVariableImpactsCalculator.CalculateImpact(variableName, model, modifiableDataset, rows, targetValuesPartition, originalCalculatorValue, replMethod, factorReplMethod);179 impact = RegressionSolutionVariableImpactsCalculator.CalculateImpact(variableName, model, problemData, modifiableDataset, rows, replMethod, factorReplMethod, targetValuesPartition, originalCalculatorValue); 182 180 } 183 181 impacts.Add(new Tuple<string, double>(variableName, impact));
Note: See TracChangeset
for help on using the changeset viewer.