Changeset 10471 for branches/HeuristicLab.ReingoldTilfordTreeLayout/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/LayoutEngines/LayoutNode.cs

Timestamp:

02/19/14 22:18:49 (10 years ago)

Author:

bburlacu

Message:

#2076: Thanks for the feedback:

• I removed the ILayoutNode Interfaces
• Fixed the error that was causing it to crash in the textual representation
• The ancestor is a node on the path between the root and the current node (from the paper), but in the algorithm it's assigned differently
• Parent is the immediate parent

I also increased the node label text size a bit and did some cosmetic improvements.

File:

• branches/HeuristicLab.ReingoldTilfordTreeLayout/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/LayoutEngines/LayoutNode.cs (modified) (4 diffs)

branches/HeuristicLab.ReingoldTilfordTreeLayout/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/LayoutEngines/LayoutNode.cs

@@ -20 +20 @@
 #endregion
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.LayoutEngines {
-  public class LayoutNode<T> : ILayoutNode<T> where T : class {
-    public ILayoutNode<T> NextLeft {
+namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
+  public class LayoutNode<T> where T : class {
+    public LayoutNode<T> NextLeft {
       get {
         return Children == null ? Thread : Children.First();
       }
     }
-    public ILayoutNode<T> NextRight {
+    public LayoutNode<T> NextRight {
       get {
         return Children == null ? Thread : Children.Last();
       }
     }
-    public ILayoutNode<T> LeftSibling {
+    public LayoutNode<T> LeftSibling {
       get {
         if (Parent == null) return null;
@@ -41 +42 @@
       }
     }
-    public ILayoutNode<T> LeftmostSibling {
+    public LayoutNode<T> LeftmostSibling {
       get {
         if (Parent == null) return null;
@@ -48 +49 @@
     }
 
-    public ILayoutNode<T> Thread { get; set; }
-    public ILayoutNode<T> Ancestor { get; set; }
-    public ILayoutNode<T> Parent { get; set; }
-    public List<ILayoutNode<T>> Children { get; set; }
+    public LayoutNode<T> Thread { get; set; }
+    public LayoutNode<T> Ancestor { get; set; }
+    public LayoutNode<T> Parent { get; set; }
+    public List<LayoutNode<T>> Children { get; set; }
     public float Mod { get; set; }
     public float Prelim { get; set; }
@@ -65 +66 @@
     }
 
-    public T Content { get; set; }
+    private T content;
+    public T Content {
+      get { return content; }
+      set {
+        if (value == null)
+          throw new ArgumentNullException("LayoutNode: Content cannot be null.");
+        content = value;
+      }
+    }
   }
 }