Changeset 5717 for branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/InteractiveSymbolicDataAnalysisSolutionSimplifierView.cs

Timestamp:

03/16/11 16:34:31 (13 years ago)

Author:

gkronber

Message:

#1418 Implemented interactive simplifier views for symbolic classification and regression.

File:

• branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/InteractiveSymbolicDataAnalysisSolutionSimplifierView.cs (modified) (4 diffs)

branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/InteractiveSymbolicDataAnalysisSolutionSimplifierView.cs

@@ -88 +88 @@
         simplifiedExpressionTree = simplifier.Simplify(Content.Model.SymbolicExpressionTree);
 
-        var replacementValues = CalculateReplacementValues(Content.Model.Interpreter, simplifiedExpressionTree, Content.ProblemData.Dataset, Content.ProblemData.TrainingIndizes);
+        var replacementValues = CalculateReplacementValues(simplifiedExpressionTree);
         foreach (var pair in replacementValues) {
           replacementNodes.Add(pair.Key, MakeConstantTreeNode(pair.Value));
         }
-        nodeImpacts = CalculateImpactValues(Content.Model.Interpreter, simplifiedExpressionTree, Content.ProblemData.Dataset, Content.ProblemData.TrainingIndizes);
+        nodeImpacts = CalculateImpactValues(simplifiedExpressionTree);
 
         // automatically fold all branches with impact = 1
@@ -110 +110 @@
     }
 
-    protected abstract Dictionary<ISymbolicExpressionTreeNode, double> CalculateReplacementValues(ISymbolicDataAnalysisExpressionTreeInterpreter interpreter, ISymbolicExpressionTree tree, Dataset dataset, IEnumerable<int> rows);
-    protected abstract Dictionary<ISymbolicExpressionTreeNode, double> CalculateImpactValues(ISymbolicDataAnalysisExpressionTreeInterpreter interpreter, ISymbolicExpressionTree tree, Dataset dataset, IEnumerable<int> rows);
+    protected abstract Dictionary<ISymbolicExpressionTreeNode, double> CalculateReplacementValues(ISymbolicExpressionTree tree);
+    protected abstract Dictionary<ISymbolicExpressionTreeNode, double> CalculateImpactValues(ISymbolicExpressionTree tree);
+    protected abstract void UpdateModel(ISymbolicExpressionTree tree);
 
     private ConstantTreeNode MakeConstantTreeNode(double value) {
@@ -137 +138 @@
 
       SymbolicExpressionTree tree = (SymbolicExpressionTree)simplifiedExpressionTree.Clone();
-
-      //this.Content.ModelChanged -= new EventHandler(Content_ModelChanged);
-      //this.Content.Model = new SymbolicRegressionModel(Content.Model.Interpreter, tree);
-      //this.Content.ModelChanged += new EventHandler(Content_ModelChanged);
-
+      UpdateModel(tree);
       this.PaintNodeImpacts();
     }
@@ -166 +163 @@
           VisualSymbolicExpressionTreeNode visualTree = treeChart.GetVisualSymbolicExpressionTreeNode(treeNode);
           
-          //if (impact < 1.0) {
-          //  visualTree.FillColor = Color.FromArgb((int)((1.0 - impact) * 255), Color.Red);
-          //} else {
-          visualTree.FillColor = Color.FromArgb((int)((impact - 1.0) / max * 255), Color.Green);
-          //}
+          // impact = 0 if no change
+          // impact < 0 if new solution is better
+          // impact > 0 if new solution is worse
+          if (impact < 0.0) {
+            visualTree.FillColor = Color.FromArgb((int)(impact / min * 255), Color.Red);
+          } else {
+            visualTree.FillColor = Color.FromArgb((int)(impact / max * 255), Color.Green);
+          }
           visualTree.ToolTip += Environment.NewLine + "Node impact: " + impact;
           visualTree.ToolTip += Environment.NewLine + "Replacement value: " + replacementValue;