Changeset 9445

Timestamp:

05/06/13 14:07:17 (12 years ago)

Author:

bburlacu

Message:

#1763: We found a bug in the InteractiveSymbolicDataAnalysisSolutionSimplifierView: when the user removes one of the linear scaling nodes from the tree (using the new tree editing functionality) then clicks optimize, an exception is raised by the constants optimizer.

We removed the tree editing functionality from the trunk, to be added again and fixed after the release.

Location:

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

Files:

• InteractiveSymbolicDataAnalysisSolutionSimplifierView.Designer.cs (modified) (3 diffs)
• InteractiveSymbolicDataAnalysisSolutionSimplifierView.cs (modified) (5 diffs)

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

@@ -54 +54 @@
       this.btnSimplify = new System.Windows.Forms.Button();
       this.treeStatusLabel = new System.Windows.Forms.Label();
-      this.treeChart = new HeuristicLab.Problems.DataAnalysis.Symbolic.Views.InteractiveSymbolicExpressionTreeChart();
+      this.treeChart = new HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views.SymbolicExpressionTreeChart();
       this.grpViewHost = new System.Windows.Forms.GroupBox();
       ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit();
@@ -176 +176 @@
       this.treeChart.LineColor = System.Drawing.Color.Black;
       this.treeChart.Location = new System.Drawing.Point(6, 32);
-      this.treeChart.ModifyTree = null;
       this.treeChart.Name = "treeChart";
       this.treeChart.Size = new System.Drawing.Size(201, 332);
@@ -220 +219 @@
     #endregion
 
-    private InteractiveSymbolicExpressionTreeChart treeChart;
+    private HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views.SymbolicExpressionTreeChart treeChart;
     private System.Windows.Forms.SplitContainer splitContainer;
     private HeuristicLab.MainForm.WindowsForms.ViewHost viewHost;

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

@@ -33 +33 @@
   public abstract partial class InteractiveSymbolicDataAnalysisSolutionSimplifierView : AsynchronousContentView {
     private Dictionary<ISymbolicExpressionTreeNode, ISymbolicExpressionTreeNode> foldedNodes;
-    private Dictionary<ISymbolicExpressionTreeNode, ISymbolicExpressionTreeNode> changedNodes;
     private Dictionary<ISymbolicExpressionTreeNode, double> nodeImpacts;
     private enum TreeState { Valid, Invalid }
@@ -41 +40 @@
       InitializeComponent();
       foldedNodes = new Dictionary<ISymbolicExpressionTreeNode, ISymbolicExpressionTreeNode>();
-      changedNodes = new Dictionary<ISymbolicExpressionTreeNode, ISymbolicExpressionTreeNode>();
       nodeImpacts = new Dictionary<ISymbolicExpressionTreeNode, double>();
       this.Caption = "Interactive Solution Simplifier";
-
-      // initialize the tree modifier that will be used to perform edit operations over the tree
-      treeChart.ModifyTree = Modify;
-    }
-
-    /// <summary>
-    /// Remove, Replace or Insert subtrees
-    /// </summary>
-    /// <param name="tree">The symbolic expression tree</param>
-    /// <param name="node">The insertion point (ie, the parent node who will receive a new child)</param>
-    /// <param name="oldChild">The subtree to be replaced</param>
-    /// <param name="newChild">The replacement subtree</param>
-    /// <param name="removeSubtree">Flag used to indicate if whole subtrees should be removed (default behavior), or just the subtree root</param>
-    private void Modify(ISymbolicExpressionTree tree, ISymbolicExpressionTreeNode node, ISymbolicExpressionTreeNode oldChild, ISymbolicExpressionTreeNode newChild, bool removeSubtree = true) {
-      if (oldChild == null && newChild == null) throw new ArgumentException();
-      if (oldChild == null) { // insertion operation
-        node.AddSubtree(newChild);
-        newChild.Parent = node;
-      } else if (newChild == null) { // removal operation
-        node.RemoveSubtree(node.IndexOfSubtree(oldChild));
-        changedNodes.Remove(oldChild);
-        foldedNodes.Remove(oldChild);
-        if (removeSubtree) {
-          foreach (var subtree in oldChild.IterateNodesPrefix()) {
-            changedNodes.Remove(subtree);
-            foldedNodes.Remove(subtree);
-          }
-        } else {
-          for (int i = oldChild.SubtreeCount - 1; i >= 0; --i) {
-            var subtree = oldChild.GetSubtree(i);
-            oldChild.RemoveSubtree(i);
-            node.AddSubtree(subtree);
-          }
-        }
-      } else { // replacement operation
-        var replacementIndex = node.IndexOfSubtree(oldChild);
-        node.RemoveSubtree(replacementIndex);
-        node.InsertSubtree(replacementIndex, newChild);
-        newChild.Parent = node;
-        if (changedNodes.ContainsKey(oldChild)) {
-          changedNodes.Add(newChild, changedNodes[oldChild]); // so that on double click the original node is restored
-          changedNodes.Remove(oldChild);
-        } else {
-          changedNodes.Add(newChild, oldChild);
-        }
-      }
-      if (IsValid(tree)) {
-        treeState = TreeState.Valid;
-        UpdateModel(Content.Model.SymbolicExpressionTree);
-      } else {
-        treeState = TreeState.Invalid;
-      }
-    }
-
-    private bool IsValid(ISymbolicExpressionTree tree) {
-      treeChart.Tree = tree;
-      treeChart.Repaint();
-      bool valid = !tree.IterateNodesPostfix().Any(node => node.SubtreeCount < node.Symbol.MinimumArity || node.SubtreeCount > node.Symbol.MaximumArity);
-      if (valid) {
-        btnOptimizeConstants.Enabled = true;
-        btnSimplify.Enabled = true;
-        treeStatusValue.Text = "Valid";
-        treeStatusValue.ForeColor = Color.Green;
-      } else {
-        btnOptimizeConstants.Enabled = false;
-        btnSimplify.Enabled = false;
-        treeStatusValue.Text = "Invalid";
-        treeStatusValue.ForeColor = Color.Red;
-      }
-      this.Refresh();
-      return valid;
     }
 
@@ -170 +97 @@
 
     private void treeChart_SymbolicExpressionTreeNodeDoubleClicked(object sender, MouseEventArgs e) {
-      if (treeState == TreeState.Invalid) return;
       var visualNode = (VisualSymbolicExpressionTreeNode)sender;
       var symbExprTreeNode = (SymbolicExpressionTreeNode)visualNode.SymbolicExpressionTreeNode;
@@ -177 +103 @@
       var parent = symbExprTreeNode.Parent;
       int indexOfSubtree = parent.IndexOfSubtree(symbExprTreeNode);
-      if (changedNodes.ContainsKey(symbExprTreeNode)) {
-        // undo node change
-        parent.RemoveSubtree(indexOfSubtree);
-        var originalNode = changedNodes[symbExprTreeNode];
-        parent.InsertSubtree(indexOfSubtree, originalNode);
-        changedNodes.Remove(symbExprTreeNode);
-      } else if (foldedNodes.ContainsKey(symbExprTreeNode)) {
+      if (foldedNodes.ContainsKey(symbExprTreeNode)) {
         // undo node folding
         SwitchNodeWithReplacementNode(parent, indexOfSubtree);
@@ -231 +151 @@
         }
         if (visualTree != null)
-          if (changedNodes.ContainsKey(treeNode)) {
-            visualTree.LineColor = Color.DodgerBlue;
-          } else if (treeNode is ConstantTreeNode && foldedNodes.ContainsKey(treeNode)) {
+          if (treeNode is ConstantTreeNode && foldedNodes.ContainsKey(treeNode)) {
             visualTree.LineColor = Color.DarkOrange;
           }