Changeset 8990

Timestamp:

12/03/12 15:29:16 (12 years ago)

Author:

mkommend

Message:

#1763: Minor improvements and code simplification in symbolic data analysis simplifier.

File:

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

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/InteractiveSymbolicDataAnalysisSolutionSimplifierView.cs

@@ -64 +64 @@
     protected override void OnContentChanged() {
       base.OnContentChanged();
+      replacementNodes = new Dictionary<ISymbolicExpressionTreeNode, ISymbolicExpressionTreeNode>();
+
       UpdateView();
       viewHost.Content = this.Content;
@@ -71 +73 @@
       if (Content == null || Content.Model == null || Content.ProblemData == null) return;
       var tree = Content.Model.SymbolicExpressionTree;
+      treeChart.Tree = tree.Root.SubtreeCount > 1 ? new SymbolicExpressionTree(tree.Root) : new SymbolicExpressionTree(tree.Root.GetSubtree(0).GetSubtree(0));
 
       var replacementValues = CalculateReplacementValues(tree);
@@ -78 +81 @@
 
       nodeImpacts = CalculateImpactValues(tree);
-
-      var model = Content.Model.SymbolicExpressionTree;
-      treeChart.Tree = model.Root.SubtreeCount > 1 ? new SymbolicExpressionTree(model.Root) : new SymbolicExpressionTree(model.Root.GetSubtree(0).GetSubtree(0));
       PaintNodeImpacts();
     }
@@ -101 +101 @@
       if (symbExprTreeNode == null) return;
       if (!replacementNodes.ContainsKey(symbExprTreeNode)) return;
+
       var tree = Content.Model.SymbolicExpressionTree;
-      var replacementNode = replacementNodes[symbExprTreeNode];
       int indexOfReplacementNode = symbExprTreeNode.Parent.IndexOfSubtree(symbExprTreeNode);
       SwitchNodeWithReplacementNode(symbExprTreeNode.Parent, indexOfReplacementNode);
-      // show only interesting part of solution 
-      treeChart.Tree = tree.Root.SubtreeCount > 1
-                         ? new SymbolicExpressionTree(tree.Root)
-                         : new SymbolicExpressionTree(tree.Root.GetSubtree(0).GetSubtree(0));
       UpdateModel(tree);
-      var vNode = treeChart.GetVisualSymbolicExpressionTreeNode(replacementNode);
-      vNode.SymbolicExpressionTreeNode = replacementNode;
-
-      vNode.LineColor = replacementNode is ConstantTreeNode ? Color.DarkOrange : Color.Black;
-      treeChart.RepaintNode(vNode);
     }
 
     private void treeChart_SymbolicExpressionTreeChanged(object sender, EventArgs e) {
       UpdateModel(Content.Model.SymbolicExpressionTree);
-      UpdateView();
     }