Changeset 15321 for branches/SimplifierViewsProgress/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4

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.Regression.Views/3.4/InteractiveSymbolicRegressionSolutionSimplifierView.cs (modified) (3 diffs)

branches/SimplifierViewsProgress/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/InteractiveSymbolicRegressionSolutionSimplifierView.cs

@@ -21 +21 @@
 
 using System;
-using System.Collections.Generic;
 using System.Threading.Tasks;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
@@ -35 +34 @@
     }
 
+    protected override ISymbolicDataAnalysisSolutionImpactValuesCalculator ImpactCalculator {
+      get { return calculator; }
+    }
+
     public InteractiveSymbolicRegressionSolutionSimplifierView()
       : base() {
@@ -46 +49 @@
       model.Scale(Content.ProblemData);
       Content.Model = model;
-    }
-
-
-    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);
-        Progress.ProgressValue += 1.0 / (tree.Length - 2);
-        impactAndReplacementValues.Add(node, new Tuple<double, double>(impactValue, replacementValue));
-      }
-      return impactAndReplacementValues;
     }