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

Timestamp:

03/16/11 19:29:57 (13 years ago)

Author:

gkronber

Message:

#1418 fixed evaluator call from validation analyzers, fixed bugs in interactive simplifier view and added apply linear scaling flag to analyzers.

File:

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

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

@@ -33 +33 @@
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Views {
   public abstract partial class InteractiveSymbolicDataAnalysisSolutionSimplifierView : AsynchronousContentView {
-    private ISymbolicExpressionTree simplifiedExpressionTree;
     private Dictionary<ISymbolicExpressionTreeNode, ConstantTreeNode> replacementNodes;
     private Dictionary<ISymbolicExpressionTreeNode, double> nodeImpacts;
@@ -41 +40 @@
       this.replacementNodes = new Dictionary<ISymbolicExpressionTreeNode, ConstantTreeNode>();
       this.nodeImpacts = new Dictionary<ISymbolicExpressionTreeNode, double>();
-      this.simplifiedExpressionTree = null;
       this.Caption = "Interactive Solution Simplifier";
     }
@@ -85 +83 @@
       replacementNodes.Clear();
       if (Content != null && Content.Model != null && Content.ProblemData != null) {
-        SymbolicDataAnalysisExpressionTreeSimplifier simplifier = new SymbolicDataAnalysisExpressionTreeSimplifier();
-        simplifiedExpressionTree = simplifier.Simplify(Content.Model.SymbolicExpressionTree);
-
-        var replacementValues = CalculateReplacementValues(simplifiedExpressionTree);
+        var tree = Content.Model.SymbolicExpressionTree;
+        var replacementValues = CalculateReplacementValues(tree);
         foreach (var pair in replacementValues) {
           replacementNodes.Add(pair.Key, MakeConstantTreeNode(pair.Value));
         }
-        nodeImpacts = CalculateImpactValues(simplifiedExpressionTree);
+        nodeImpacts = CalculateImpactValues(Content.Model.SymbolicExpressionTree);
 
         // automatically fold all branches with impact = 1
-        List<ISymbolicExpressionTreeNode> nodeList = simplifiedExpressionTree.Root.GetSubTree(0).IterateNodesPrefix().ToList();
+        List<ISymbolicExpressionTreeNode> nodeList = Content.Model.SymbolicExpressionTree.Root.GetSubTree(0).IterateNodesPrefix().ToList();
         foreach (var parent in nodeList) {
           for (int subTreeIndex = 0; subTreeIndex < parent.SubTrees.Count(); subTreeIndex++) {
@@ -105 +101 @@
         }
         // show only interesting part of solution
-        this.treeChart.Tree = new SymbolicExpressionTree(simplifiedExpressionTree.Root.GetSubTree(0).GetSubTree(0));
+        this.treeChart.Tree = new SymbolicExpressionTree(tree.Root.GetSubTree(0).GetSubTree(0));
         this.PaintNodeImpacts();
       }
@@ -125 +121 @@
     private void treeChart_SymbolicExpressionTreeNodeDoubleClicked(object sender, MouseEventArgs e) {
       VisualSymbolicExpressionTreeNode visualTreeNode = (VisualSymbolicExpressionTreeNode)sender;
-      foreach (SymbolicExpressionTreeNode treeNode in simplifiedExpressionTree.IterateNodesPostfix()) {
+      var tree = Content.Model.SymbolicExpressionTree;
+      foreach (SymbolicExpressionTreeNode treeNode in tree.IterateNodesPostfix()) {
         for (int i = 0; i < treeNode.SubTrees.Count(); i++) {
           ISymbolicExpressionTreeNode subTree = treeNode.GetSubTree(i);
@@ -135 +132 @@
 
       // show only interesting part of solution
-      this.treeChart.Tree = new SymbolicExpressionTree(simplifiedExpressionTree.Root.GetSubTree(0).GetSubTree(0));
+      this.treeChart.Tree = new SymbolicExpressionTree(tree.Root.GetSubTree(0).GetSubTree(0));
 
-      SymbolicExpressionTree tree = (SymbolicExpressionTree)simplifiedExpressionTree.Clone();
       UpdateModel(tree);
       this.PaintNodeImpacts();
@@ -157 +153 @@
       double max = impacts.Max();
       double min = impacts.Min();
-      foreach (ISymbolicExpressionTreeNode treeNode in simplifiedExpressionTree.IterateNodesPostfix()) {
+      foreach (ISymbolicExpressionTreeNode treeNode in Content.Model.SymbolicExpressionTree.IterateNodesPostfix()) {
         if (!(treeNode is ConstantTreeNode) && nodeImpacts.ContainsKey(treeNode)) {
           double impact = this.nodeImpacts[treeNode];
           double replacementValue = this.replacementNodes[treeNode].Value;
           VisualSymbolicExpressionTreeNode visualTree = treeChart.GetVisualSymbolicExpressionTreeNode(treeNode);
-          
+
           // impact = 0 if no change
           // impact < 0 if new solution is better
@@ -180 +176 @@
 
     private void PaintCollapsedNodes() {
-      foreach (ISymbolicExpressionTreeNode treeNode in simplifiedExpressionTree.IterateNodesPostfix()) {
+      foreach (ISymbolicExpressionTreeNode treeNode in Content.Model.SymbolicExpressionTree.IterateNodesPostfix()) {
         if (treeNode is ConstantTreeNode && replacementNodes.ContainsValue((ConstantTreeNode)treeNode))
           this.treeChart.GetVisualSymbolicExpressionTreeNode(treeNode).LineColor = Color.DarkOrange;
@@ -192 +188 @@
 
     private void btnSimplify_Click(object sender, EventArgs e) {
-      this.CalculateReplacementNodesAndNodeImpacts();
+      SymbolicDataAnalysisExpressionTreeSimplifier simplifier = new SymbolicDataAnalysisExpressionTreeSimplifier();
+      var simplifiedExpressionTree = simplifier.Simplify(Content.Model.SymbolicExpressionTree);
+      UpdateModel(simplifiedExpressionTree);
     }
   }