Changeset 8935 for branches/HeuristicLab.TreeSimplifier/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/InteractiveSymbolicDataAnalysisSolutionSimplifierView.cs

Timestamp:

11/22/12 15:03:32 (12 years ago)

Author:

bburlacu

Message:

#1763: Bugfixes and refactoring as suggested in the comments above.

File:

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

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

@@ -96 +96 @@
       if (Content == null || Content.Model == null || Content.ProblemData == null) return;
       var tree = model;
+      CalculateReplacementNodesAndNodeImpacts(tree);
+    }
+
+    private void CalculateReplacementNodesAndNodeImpacts(ISymbolicExpressionTree tree) {
       var replacementValues = CalculateReplacementValues(tree);
       foreach (var pair in replacementValues.Where(pair => !(pair.Key is ConstantTreeNode))) {
@@ -117 +121 @@
     }
 
-    private void CalculateReplacementNodesAndNodeImpacts(ISymbolicExpressionTree tree) {
-      var replacementValues = CalculateReplacementValues(tree);
-      foreach (var pair in replacementValues.Where(pair => !(pair.Key is ConstantTreeNode))) {
-        replacementNodes[pair.Key] = MakeConstantTreeNode(pair.Value);
-      }
-      nodeImpacts = CalculateImpactValues(tree);
-
-      if (!updateInProgress) {
-        // automatically fold all branches with impact = 0
-        List<ISymbolicExpressionTreeNode> nodeList = tree.Root.GetSubtree(0).IterateNodesPrefix().ToList();
-        foreach (var parent in nodeList) {
-          for (int subTreeIndex = 0; subTreeIndex < parent.SubtreeCount; subTreeIndex++) {
-            var child = parent.GetSubtree(subTreeIndex);
-            if (!(child.Symbol is Constant) && nodeImpacts[child].IsAlmost(0.0)) {
-              SwitchNodeWithReplacementNode(parent, subTreeIndex);
-            }
-          }
-        }
-      }
-      PaintModel();
-    }
-
     private void PaintModel() {
       // show only interesting part of solution 
@@ -149 +131 @@
     protected abstract void UpdateModel(ISymbolicExpressionTree tree);
 
-    private ConstantTreeNode MakeConstantTreeNode(double value) {
-      Constant constant = new Constant();
-      constant.MinValue = value - 1;
-      constant.MaxValue = value + 1;
-      ConstantTreeNode constantTreeNode = (ConstantTreeNode)constant.CreateTreeNode();
+    private static ConstantTreeNode MakeConstantTreeNode(double value) {
+      var constant = new Constant { MinValue = value - 1, MaxValue = value + 1 };
+      var constantTreeNode = (ConstantTreeNode)constant.CreateTreeNode();
       constantTreeNode.Value = value;
       return constantTreeNode;
@@ -164 +144 @@
       if (symbExprTreeNode == null) return;
       var tree = model;
+
+      bool update = false;
       // check if the node value/weight has been altered
       // if so, the first double click will return the node to its original value/weight/variable name
@@ -171 +153 @@
         variable.VariableName = originalVariableNames[symbExprTreeNode];
         originalVariableNames.Remove(variable);
+        update = true;
+      } else if (originalValues.ContainsKey(symbExprTreeNode)) {
+        double value = originalValues[symbExprTreeNode];
+        if (symbExprTreeNode.Symbol is Constant) {
+          var constantTreeNode = (ConstantTreeNode)symbExprTreeNode;
+          constantTreeNode.Value = value;
+        } else if (symbExprTreeNode.Symbol is Variable) {
+          var variable = (VariableTreeNode)symbExprTreeNode;
+          variable.Weight = value;
+        }
+        originalValues.Remove(symbExprTreeNode);
+        update = true;
+      } else if (replacementNodes.ContainsKey(symbExprTreeNode)) {
+        foreach (var treeNode in tree.IterateNodesPostfix()) {
+          for (int i = 0; i < treeNode.SubtreeCount; i++) {
+            var subtree = treeNode.GetSubtree(i);
+            if (subtree == symbExprTreeNode) {
+              SwitchNodeWithReplacementNode(treeNode, i);
+              // show only interesting part of solution 
+              treeChart.Tree = tree.Root.SubtreeCount > 1
+                                 ? new SymbolicExpressionTree(tree.Root)
+                                 : new SymbolicExpressionTree(tree.Root.GetSubtree(0).GetSubtree(0));
+              update = true;
+            }
+          }
+          if (update) break;
+        }
+      }
+      if (update) {
         updateInProgress = true;
         UpdateModel(tree);
         updateInProgress = false;
-        return;
-      }
-      if (originalValues.ContainsKey(symbExprTreeNode)) {
-        double value = originalValues[symbExprTreeNode];
-        if (symbExprTreeNode.Symbol is Constant)
-          ((ConstantTreeNode)symbExprTreeNode).Value = value;
-        else if (symbExprTreeNode.Symbol is Variable)
-          ((VariableTreeNode)symbExprTreeNode).Weight = value;
-        originalValues.Remove(symbExprTreeNode);
-        updateInProgress = true;
-        UpdateModel(tree);
-        updateInProgress = false;
-        return;
-      }
-      foreach (SymbolicExpressionTreeNode treeNode in tree.IterateNodesPostfix()) {
-        for (int i = 0; i < treeNode.SubtreeCount; i++) {
-          ISymbolicExpressionTreeNode subTree = treeNode.GetSubtree(i);
-          // only allow to replace nodes for which a replacement value is known (replacement value for ADF nodes are not available)
-          if (subTree == symbExprTreeNode && replacementNodes.ContainsKey(subTree)) {
-            SwitchNodeWithReplacementNode(treeNode, i);
-            // show only interesting part of solution 
-            treeChart.Tree = tree.Root.SubtreeCount > 1 ? new SymbolicExpressionTree(tree.Root) : new SymbolicExpressionTree(tree.Root.GetSubtree(0).GetSubtree(0));
-            updateInProgress = true;
-            UpdateModel(tree);
-            updateInProgress = false;
-            return; // break all loops
-          }
-        }
       }
     }
@@ -222 +205 @@
 
       if (node is VariableTreeNode) {
-        var variable = dialog.Content as VariableTreeNode;
-        var weight = double.Parse(dialog.NewValueTextBox.Text);
-        var name = (string)dialog.VariableNameComboBox.SelectedItem;
+        var variable = (VariableTreeNode)node;
+        var weight = double.Parse(dialog.newValueTextBox.Text);
+        var name = (string)dialog.variableNamesCombo.SelectedItem;
         if (!variable.Weight.Equals(weight)) {
           flag1 = true;
@@ -236 +219 @@
         }
       } else if (node is ConstantTreeNode) {
-        var constant = dialog.Content as ConstantTreeNode;
-        var value = double.Parse(dialog.NewValueTextBox.Text);
+        var constant = (ConstantTreeNode)node;
+        var value = double.Parse(dialog.newValueTextBox.Text);
         if (!constant.Value.Equals(value)) {
           flag1 = true;
@@ -355 +338 @@
       } else if (e.Error != null) {
         // There was an error during the operation.
-        // Error-handling
       } else {
         // The operation completed normally. We can update the model