Changeset 10499 for trunk

Timestamp:

02/21/14 14:25:14 (11 years ago)

Author:

gkronber

Message:

#2092: don't show the root node if it has only one sub-tree (the result producing branch). If ADFs are defined then it is necessary to show the root node as well.

File:

• trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/SymbolicExpressionTreeChart.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/SymbolicExpressionTreeChart.cs

@@ -108 +108 @@
         visualLines = new Dictionary<Tuple<ISymbolicExpressionTreeNode, ISymbolicExpressionTreeNode>, VisualSymbolicExpressionTreeNodeConnection>();
         if (tree != null) {
-          foreach (ISymbolicExpressionTreeNode node in tree.IterateNodesPrefix()) {
+          IEnumerable<ISymbolicExpressionTreeNode> nodes;
+          if (tree.Root.SubtreeCount == 1) nodes = tree.Root.GetSubtree(0).IterateNodesPrefix();
+          else nodes = tree.Root.IterateNodesPrefix();
+          foreach (ISymbolicExpressionTreeNode node in nodes) {
             visualTreeNodes[node] = new VisualSymbolicExpressionTreeNode(node);
             if (node.Parent != null) visualLines[Tuple.Create(node.Parent, node)] = new VisualSymbolicExpressionTreeNodeConnection();
@@ -266 +269 @@
 
     #region methods for painting the symbolic expression tree
-    private void DrawFunctionTree(ISymbolicExpressionTree symbolicExpressionTree, Graphics graphics, int preferredWidth, int preferredHeight, int minHDistance, int minVDistance) {
+    private void DrawFunctionTree(ISymbolicExpressionTree symbolicExpressionTree, Graphics graphics, int preferredWidth, int preferredHeight, int minHDistance, int minVDistance) {      
       var layoutNodes = layoutAdapter.Convert(symbolicExpressionTree).ToList();
+      if(symbolicExpressionTree.Root.SubtreeCount==1) layoutNodes.RemoveAt(0);
       layoutEngine.Reset();
       layoutEngine.Root = layoutNodes[0];