Changeset 15321 for branches/SimplifierViewsProgress/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views/3.4/InteractiveSymbolicClassificationSolutionSimplifierViewBase.cs

Timestamp:

08/10/17 17:16:07 (7 years ago)

Author:

pfleck

Message:

#1666

• Moved CalculateImpactAndReplacementValues into base-class.
• Use SymRegImpactCalculator for SymTimeSeriesPrognosis.
• Unified CalculateImpactAndReplacementValues for all SimplifierViews.

File:

• branches/SimplifierViewsProgress/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views/3.4/InteractiveSymbolicClassificationSolutionSimplifierViewBase.cs (modified) (3 diffs)

branches/SimplifierViewsProgress/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views/3.4/InteractiveSymbolicClassificationSolutionSimplifierViewBase.cs

@@ -21 +21 @@
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
@@ -34 +32 @@
       get { return (ISymbolicClassificationSolution)base.Content; }
       set { base.Content = value; }
+    }
+
+    protected override ISymbolicDataAnalysisSolutionImpactValuesCalculator ImpactCalculator {
+      get { return calculator; }
     }
 
@@ -60 +62 @@
     }
 
-    protected override Dictionary<ISymbolicExpressionTreeNode, Tuple<double, double>> CalculateImpactAndReplacementValues(ISymbolicExpressionTree tree) {
-      var impactAndReplacementValues = new Dictionary<ISymbolicExpressionTreeNode, Tuple<double, double>>();
-      foreach (var node in tree.Root.GetSubtree(0).GetSubtree(0).IterateNodesPrefix()) {
-        double impactValue, replacementValue, newQualityForImpactsCalculation;
-        calculator.CalculateImpactAndReplacementValues(Content.Model, node, Content.ProblemData, Content.ProblemData.TrainingIndices, out impactValue, out replacementValue, out newQualityForImpactsCalculation);
-        impactAndReplacementValues.Add(node, new Tuple<double, double>(impactValue, replacementValue));
-      }
-      return impactAndReplacementValues;
-    }
-
     protected override void btnOptimizeConstants_Click(object sender, EventArgs e) {