Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
02/20/14 20:37:55 (10 years ago)
Author:
bburlacu
Message:

#2156: Modified the InteractiveSymbolicDataAnalysisSolutionSimplifierView to use the unified method of calculating impact and replacement values.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/InteractiveSymbolicRegressionSolutionSimplifierView.cs

    r9456 r10492  
    5656
    5757    protected override Dictionary<ISymbolicExpressionTreeNode, double> CalculateImpactValues(ISymbolicExpressionTree tree) {
    58       return tree.Root.GetSubtree(0).GetSubtree(0).IterateNodesPrefix().ToDictionary(
    59         n => n,
    60         n => calculator.CalculateImpactValue(Content.Model, n, Content.ProblemData, Content.ProblemData.TrainingIndices, Content.TrainingRSquared)
    61         );
     58      var values = CalculateImpactAndReplacementValues(tree);
     59      return values.ToDictionary(x => x.Key, x => x.Value.Item1);
     60    }
     61
     62    protected override Dictionary<ISymbolicExpressionTreeNode, Tuple<double, double>> CalculateImpactAndReplacementValues(ISymbolicExpressionTree tree) {
     63      var impactAndReplacementValues = new Dictionary<ISymbolicExpressionTreeNode, Tuple<double, double>>();
     64      foreach (var node in tree.Root.GetSubtree(0).GetSubtree(0).IterateNodesPrefix()) {
     65        double impactValue, replacementValue;
     66        calculator.CalculateImpactAndReplacementValues(Content.Model, node, Content.ProblemData, Content.ProblemData.TrainingIndices, out impactValue, out replacementValue);
     67        impactAndReplacementValues.Add(node, new Tuple<double, double>(impactValue, replacementValue));
     68      }
     69      return impactAndReplacementValues;
    6270    }
    6371
Note: See TracChangeset for help on using the changeset viewer.