Changeset 6108

Timestamp:

05/03/11 16:40:55 (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) (4 diffs)

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

@@ -29 +29 @@
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views;
 using HeuristicLab.MainForm.WindowsForms;
-using HeuristicLab.Problems.DataAnalysis.Symbolic;
 
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Views {
@@ -131 +130 @@
           // only allow to replace nodes for which a replacement value is known (replacement value for ADF nodes are not available)
           if (subTree == visualTreeNode.SymbolicExpressionTreeNode && replacementNodes.ContainsKey(subTree)) {
-            double replacementImpact = nodeImpacts.ContainsKey(replacementNodes[subTree]) ? nodeImpacts[replacementNodes[subTree]] : 0.0;
-            double originalImpact = nodeImpacts.ContainsKey(subTree) ? nodeImpacts[subTree] : 0.0;
             SwitchNodeWithReplacementNode(treeNode, i);
 
@@ -140 +137 @@
             else
               this.treeChart.Tree = new SymbolicExpressionTree(tree.Root.GetSubtree(0).GetSubtree(0)); // 1st child of RPB
-            if (!(originalImpact.IsAlmost(0.0) && replacementImpact.IsAlmost(0.0))) {
-              // update everything after the change if necessary (impact != 0)            
-              UpdateModel(tree);
-            } else {
-              // both impacts are zero, so we only need to repaint the nodes 
-              PaintNodeImpacts();
-            }
+
+            UpdateModel(tree);
             return; // break all loops
           }
@@ -191 +183 @@
             visualTree.ToolTip += Environment.NewLine + "Replacement value: " + constantReplacementNode.Value;
           }
-        } 
+        }
       }
       this.PaintCollapsedNodes();