Changeset 4106 for trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/SymbolicExpressionTreeNode.cs

Timestamp:

07/26/10 16:18:45 (14 years ago)

Author:

gkronber

Message:

Fixed bugs in SubtreeCrossover, ArgumentCreater and ArgumentDuplicater and updated unit tests for symbolic expression tree operators. #1103

File:

• trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/SymbolicExpressionTreeNode.cs (modified) (9 diffs)

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

@@ -51 +51 @@
     }
 
-    public SymbolicExpressionTreeNode() {
+    internal SymbolicExpressionTreeNode() {
       // don't allocate subtrees list here!
       // because we don't want to allocate it in terminal nodes
@@ -85 +85 @@
     }
 
-    internal virtual ISymbolicExpressionGrammar Grammar {
+    public virtual ISymbolicExpressionGrammar Grammar {
       get { return parent.Grammar; }
       set { throw new NotSupportedException("Grammar can be set only for SymbolicExpressionTreeTopLevelNodes."); }
@@ -94 +94 @@
       else {
         size = 1;
-        for (int i = 0; i < SubTrees.Count; i++) size += (short)SubTrees[i].GetSize();
+        if (SubTrees != null) {
+          for (int i = 0; i < SubTrees.Count; i++) size += (short)SubTrees[i].GetSize();
+        }
         return size;
       }
@@ -102 +104 @@
       if (height > 0) return height;
       else {
-        for (int i = 0; i < SubTrees.Count; i++) height = Math.Max(height, (short)SubTrees[i].GetHeight());
+        if (SubTrees != null) {
+          for (int i = 0; i < SubTrees.Count; i++) height = Math.Max(height, (short)SubTrees[i].GetHeight());
+        }
         height++;
         return height;
@@ -112 +116 @@
 
     public virtual void AddSubTree(SymbolicExpressionTreeNode tree) {
-      subTrees.Add(tree);
+      SubTrees.Add(tree);
       tree.Parent = this;
       ResetCachedValues();
@@ -118 +122 @@
 
     public virtual void InsertSubTree(int index, SymbolicExpressionTreeNode tree) {
-      subTrees.Insert(index, tree);
+      SubTrees.Insert(index, tree);
       tree.Parent = this;
       ResetCachedValues();
@@ -124 +128 @@
 
     public virtual void RemoveSubTree(int index) {
-      subTrees[index].Parent = null;
-      subTrees.RemoveAt(index);
+      SubTrees[index].Parent = null;
+      SubTrees.RemoveAt(index);
       ResetCachedValues();
     }
@@ -137 +141 @@
     public void ForEachNodePrefix(Action<SymbolicExpressionTreeNode> a) {
       a(this);
-      for (int i = 0; i < SubTrees.Count; i++) {
-        SubTrees[i].ForEachNodePrefix(a);
+      if (SubTrees != null) {
+        for (int i = 0; i < SubTrees.Count; i++) {
+          SubTrees[i].ForEachNodePrefix(a);
+        }
       }
     }
@@ -149 +155 @@
 
     public void ForEachNodePostfix(Action<SymbolicExpressionTreeNode> a) {
-      for (int i = 0; i < SubTrees.Count; i++) {
-        SubTrees[i].ForEachNodePrefix(a);
+      if (SubTrees != null) {
+        for (int i = 0; i < SubTrees.Count; i++) {
+          SubTrees[i].ForEachNodePostfix(a);
+        }
       }
       a(this);