Changeset 15371 for trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views/3.4

Timestamp:

09/19/17 10:49:02 (7 years ago)

Author:

pfleck

Message:

#1666: Merged into trunk

Location:

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views

Files:

• . (modified) (1 prop)
• 3.4/InteractiveSymbolicClassificationSolutionSimplifierViewBase.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views/3.4/InteractiveSymbolicClassificationSolutionSimplifierViewBase.cs

@@ -20 +20 @@
 #endregion
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
@@ -29 +26 @@
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views {
   public abstract partial class InteractiveSymbolicClassificationSolutionSimplifierViewBase : InteractiveSymbolicDataAnalysisSolutionSimplifierView {
-    private readonly SymbolicClassificationSolutionImpactValuesCalculator calculator;
-
     public new ISymbolicClassificationSolution Content {
       get { return (ISymbolicClassificationSolution)base.Content; }
@@ -36 +31 @@
     }
 
-    public InteractiveSymbolicClassificationSolutionSimplifierViewBase()
-      : base() {
+    protected InteractiveSymbolicClassificationSolutionSimplifierViewBase()
+      : base(new SymbolicClassificationSolutionImpactValuesCalculator()) {
       InitializeComponent();
       this.Caption = "Interactive Classification Solution Simplifier";
-
-      calculator = new SymbolicClassificationSolutionImpactValuesCalculator();
     }
 
@@ -59 +52 @@
       return 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);
-        impactAndReplacementValues.Add(node, new Tuple<double, double>(impactValue, replacementValue));
-      }
-      return impactAndReplacementValues;
-    }
-
-    protected override void btnOptimizeConstants_Click(object sender, EventArgs e) {
-
-    }
   }
 }