Changeset 16041 for branches/2904_CalculateImpacts/HeuristicLab.Problems.DataAnalysis.Views

Timestamp:

08/03/18 10:55:23 (6 years ago)

Author:

fholzing

Message:

#2904: Removed ElementAt

Location:

branches/2904_CalculateImpacts/HeuristicLab.Problems.DataAnalysis.Views/3.4

Files:

• Classification/ClassificationSolutionVariableImpactsView.cs (modified) (2 diffs)
• Regression/RegressionSolutionVariableImpactsView.cs (modified) (2 diffs)

branches/2904_CalculateImpacts/HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification/ClassificationSolutionVariableImpactsView.cs

@@ -168 +168 @@
       OnlineCalculatorError error;
       IEnumerable<double> targetValuesPartition = problemData.Dataset.GetDoubleValues(problemData.TargetVariable, rows);
-      IEnumerable<double> estimatedValuesPartition = rows.Select(v => estimatedValues.ElementAt(v));
+      IEnumerable<double> estimatedValuesPartition = Content.GetEstimatedClassValues(rows);
       var originalCalculatorValue = ClassificationSolutionVariableImpactsCalculator.CalculateVariableImpact(targetValuesPartition, estimatedValuesPartition, out error);
       if (error != OnlineCalculatorError.None) throw new InvalidOperationException("Error during calculation.");
@@ -177 +177 @@
         progress.Status = string.Format("Calculating impact for variable {0} ({1} of {2})", variableName, i, count);
 
-        double impact = ClassificationSolutionVariableImpactsCalculator.CalculateImpact(variableName, model, modifiableDataset, rows, targetValuesPartition, originalCalculatorValue, replMethod, factorReplMethod);
+        double impact = 0;
+        //If the variable isn't used for prediction, it has zero impact.
+        if (model.VariablesUsedForPrediction.Contains(variableName)) {
+          impact = ClassificationSolutionVariableImpactsCalculator.CalculateImpact(variableName, model, modifiableDataset, rows, targetValuesPartition, originalCalculatorValue, replMethod, factorReplMethod);
+        }
         impacts.Add(new Tuple<string, double>(variableName, impact));
       }

branches/2904_CalculateImpacts/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionVariableImpactsView.cs

@@ -165 +165 @@
       //Calculate original quality-values (via calculator, default is R²)
       OnlineCalculatorError error;
-      IEnumerable<double> targetValuesPartition = rows.Select(v => problemData.TargetVariableValues.ElementAt(v));
-      IEnumerable<double> estimatedValuesPartition = rows.Select(v => estimatedValues.ElementAt(v));
+      IEnumerable<double> targetValuesPartition = problemData.Dataset.GetDoubleValues(problemData.TargetVariable, rows);
+      IEnumerable<double> estimatedValuesPartition = Content.GetEstimatedValues(rows);
+
       var originalCalculatorValue = RegressionSolutionVariableImpactsCalculator.CalculateVariableImpact(targetValuesPartition, estimatedValuesPartition, out error);
       if (error != OnlineCalculatorError.None) throw new InvalidOperationException("Error during calculation.");
@@ -175 +176 @@
         progress.Status = string.Format("Calculating impact for variable {0} ({1} of {2})", variableName, i, count);
 
-        double impact = RegressionSolutionVariableImpactsCalculator.CalculateImpact(variableName, model, modifiableDataset, rows, targetValuesPartition, originalCalculatorValue, replMethod, factorReplMethod);
+        double impact = 0;
+        //If the variable isn't used for prediction, it has zero impact.
+        if (model.VariablesUsedForPrediction.Contains(variableName)) {
+          impact = RegressionSolutionVariableImpactsCalculator.CalculateImpact(variableName, model, modifiableDataset, rows, targetValuesPartition, originalCalculatorValue, replMethod, factorReplMethod);
+        }
         impacts.Add(new Tuple<string, double>(variableName, impact));
       }