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

Timestamp:

08/06/18 17:35:11 (6 years ago)

Author:

fholzing

Message:

#2904: Also applied changes from regression to classification

File:

• branches/2904_CalculateImpacts/HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification/ClassificationSolutionVariableImpactsView.cs (modified) (6 diffs)

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

@@ -107 +107 @@
 
     private async void UpdateVariableImpact() {
+      IProgress progress;
+
       //Check if the selection is valid
       if (Content == null) { return; }
@@ -112 +114 @@
       if (dataPartitionComboBox.SelectedIndex < 0) { return; }
       if (factorVarReplComboBox.SelectedIndex < 0) { return; }
-
-      IProgress progress;
 
       //Prepare arguments
@@ -137 +137 @@
 
         List<Tuple<string, double>> impacts = null;
-
-        await Task.Run(() => { impacts = CalculateVariableImpacts(originalVariableOrdering, (IClassificationModel)Content.Model.Clone(), problemData, Content.EstimatedClassValues, dataPartition, replMethod, factorReplMethod, cancellationToken.Token, progress); });
+        await Task.Run(() => { impacts = CalculateVariableImpacts(originalVariableOrdering, Content.Model, problemData, Content.EstimatedClassValues, dataPartition, replMethod, factorReplMethod, cancellationToken.Token, progress); });
         if (impacts == null) { return; }
 
         rawVariableImpacts.Clear();
-        originalVariableOrdering.ForEach(v => rawVariableImpacts.Add(new Tuple<string, double>(v, impacts.First(vv => vv.Item1 == v).Item2)));
+        rawVariableImpacts.AddRange(impacts);
         UpdateOrdering();
       }
@@ -149 +148 @@
       }
     }
-
     private List<Tuple<string, double>> CalculateVariableImpacts(List<string> originalVariableOrdering,
       IClassificationModel model,
       IClassificationProblemData problemData,
-      IEnumerable<double> estimatedValues,
+      IEnumerable<double> estimatedClassValues,
       ClassificationSolutionVariableImpactsCalculator.DataPartitionEnum dataPartition,
       ClassificationSolutionVariableImpactsCalculator.ReplacementMethodEnum replMethod,
@@ -166 +164 @@
 
       //Calculate original quality-values (via calculator, default is R²)
-      OnlineCalculatorError error;
       IEnumerable<double> targetValuesPartition = problemData.Dataset.GetDoubleValues(problemData.TargetVariable, rows);
-      IEnumerable<double> estimatedValuesPartition = Content.GetEstimatedClassValues(rows);
-      var originalCalculatorValue = ClassificationSolutionVariableImpactsCalculator.CalculateVariableImpact(targetValuesPartition, estimatedValuesPartition, out error);
-      if (error != OnlineCalculatorError.None) throw new InvalidOperationException("Error during calculation.");
-
+      IEnumerable<double> estimatedClassValuesPartition = Content.GetEstimatedClassValues(rows);
+
+      var originalCalculatorValue = ClassificationSolutionVariableImpactsCalculator.CalculateQuality(targetValuesPartition, estimatedClassValuesPartition);
+      var clonedModel = (IClassificationModel)model.Clone();
       foreach (var variableName in originalVariableOrdering) {
         if (cancellationToken.Token.IsCancellationRequested) { return null; }
@@ -180 +177 @@
         //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);
+          impact = ClassificationSolutionVariableImpactsCalculator.CalculateImpact(variableName, clonedModel, problemData, modifiableDataset, rows, replMethod, factorReplMethod, targetValuesPartition, originalCalculatorValue);
         }
         impacts.Add(new Tuple<string, double>(variableName, impact));