Changeset 3926 for trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3

Timestamp:

06/17/10 14:43:04 (14 years ago)

Author:

mkommend

Message:

removed ScaledSymbolicExpressionTree from the scopes in the ValidationBestScaledSymbolicReressionSolutionAnalyzer and
made SymbolicExpressionTree to work without a root node (ticket #938)

File:

• trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/SymbolicExpressionTree.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/SymbolicExpressionTree.cs

@@ -53 +53 @@
     public int Size {
       get {
+        if (root == null)
+          return 0;
         return root.GetSize();
       }
@@ -59 +61 @@
     public int Height {
       get {
+        if (root == null)
+          return 0;
         return root.GetHeight();
       }
@@ -73 +77 @@
 
     public IEnumerable<SymbolicExpressionTreeNode> IterateNodesPrefix() {
+      if (root == null)
+        return new SymbolicExpressionTreeNode[0];
       return root.IterateNodesPrefix();
     }
     public IEnumerable<SymbolicExpressionTreeNode> IterateNodesPostfix() {
+      if (root == null)
+        return new SymbolicExpressionTreeNode[0];
       return root.IterateNodesPostfix();
     }
@@ -82 +90 @@
       SymbolicExpressionTree clone = new SymbolicExpressionTree();
       cloner.RegisterClonedObject(this, clone);
-      clone.root = (SymbolicExpressionTreeNode)this.root.Clone();
+      if (root != null)
+        clone.root = (SymbolicExpressionTreeNode)this.root.Clone();
       return clone;
     }