Changeset 6113 for trunk/sources

Timestamp:

05/03/11 18:43:22 (14 years ago)

Author:

mkommend

Message:

#1504: Corrected bug in symbolic simplifier view.

File:

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

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

@@ -34 +34 @@
     private Dictionary<ISymbolicExpressionTreeNode, ISymbolicExpressionTreeNode> replacementNodes;
     private Dictionary<ISymbolicExpressionTreeNode, double> nodeImpacts;
+    private bool updateInProgress = false;
 
     public InteractiveSymbolicDataAnalysisSolutionSimplifierView() {
@@ -90 +91 @@
         nodeImpacts = CalculateImpactValues(Content.Model.SymbolicExpressionTree);
 
-        // automatically fold all branches with impact = 1
-        List<ISymbolicExpressionTreeNode> nodeList = Content.Model.SymbolicExpressionTree.Root.GetSubtree(0).IterateNodesPrefix().ToList();
-        foreach (var parent in nodeList) {
-          for (int subTreeIndex = 0; subTreeIndex < parent.SubtreesCount; subTreeIndex++) {
-            var child = parent.GetSubtree(subTreeIndex);
-            if (!(child.Symbol is Constant) && nodeImpacts[child].IsAlmost(0.0)) {
-              SwitchNodeWithReplacementNode(parent, subTreeIndex);
+        if (!updateInProgress) {
+          // automatically fold all branches with impact = 1
+          List<ISymbolicExpressionTreeNode> nodeList = Content.Model.SymbolicExpressionTree.Root.GetSubtree(0).IterateNodesPrefix().ToList();
+          foreach (var parent in nodeList) {
+            for (int subTreeIndex = 0; subTreeIndex < parent.SubtreesCount; subTreeIndex++) {
+              var child = parent.GetSubtree(subTreeIndex);
+              if (!(child.Symbol is Constant) && nodeImpacts[child].IsAlmost(0.0)) {
+                SwitchNodeWithReplacementNode(parent, subTreeIndex);
+              }
             }
           }
         }
+
         // show only interesting part of solution 
         if (tree.Root.SubtreesCount > 1)
@@ -138 +142 @@
               this.treeChart.Tree = new SymbolicExpressionTree(tree.Root.GetSubtree(0).GetSubtree(0)); // 1st child of RPB
 
+            updateInProgress = true;
             UpdateModel(tree);
+            updateInProgress = false;
             return; // break all loops
           }