Changeset 5733 for branches/DataAnalysis Refactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionTreeNode.cs

Timestamp:

03/17/11 14:07:47 (13 years ago)

Author:

mkommend

Message:

#1418: Corrected problem interfaces & unified naming of subtrees.

File:

• branches/DataAnalysis Refactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionTreeNode.cs (modified) (10 diffs)

branches/DataAnalysis Refactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionTreeNode.cs

@@ -30 +30 @@
   public class SymbolicExpressionTreeNode : DeepCloneable, ISymbolicExpressionTreeNode {
     [Storable]
-    private IList<ISymbolicExpressionTreeNode> subTrees;
+    private IList<ISymbolicExpressionTreeNode> subtrees;
     [Storable]
     private ISymbol symbol;
@@ -55 +55 @@
       : base() {
       symbol = original.symbol; // symbols are reused
-      subTrees = new List<ISymbolicExpressionTreeNode>(original.subTrees.Count);
-      foreach (var subtree in original.subTrees) {
-        var clonedSubTree = cloner.Clone(subtree);
-        subTrees.Add(clonedSubTree);
-        clonedSubTree.Parent = this;
+      subtrees = new List<ISymbolicExpressionTreeNode>(original.subtrees.Count);
+      foreach (var subtree in original.subtrees) {
+        var clonedSubtree = cloner.Clone(subtree);
+        subtrees.Add(clonedSubtree);
+        clonedSubtree.Parent = this;
       }
     }
@@ -74 +74 @@
     public SymbolicExpressionTreeNode(ISymbol symbol)
       : base() {
-      subTrees = new List<ISymbolicExpressionTreeNode>(3);
+      subtrees = new List<ISymbolicExpressionTreeNode>(3);
       this.symbol = symbol;
     }
@@ -81 +81 @@
     [StorableHook(HookType.AfterDeserialization)]
     private void AfterDeserialization() {
-      if (subTrees != null) {
-        foreach (var subtree in subTrees)
+      if (subtrees != null) {
+        foreach (var subtree in subtrees)
           subtree.Parent = this;
       }
@@ -91 +91 @@
     }
 
-    public virtual IEnumerable<ISymbolicExpressionTreeNode> SubTrees {
-      get { return subTrees; }
+    public virtual IEnumerable<ISymbolicExpressionTreeNode> Subtrees {
+      get { return subtrees; }
     }
 
@@ -103 +103 @@
       else {
         length = 1;
-        if (subTrees != null) {
-          for (int i = 0; i < subTrees.Count; i++) {
-            checked { length += (ushort)subTrees[i].GetLength(); }
+        if (subtrees != null) {
+          for (int i = 0; i < subtrees.Count; i++) {
+            checked { length += (ushort)subtrees[i].GetLength(); }
           }
         }
@@ -115 +115 @@
       if (depth > 0) return depth;
       else {
-        if (subTrees != null) {
-          for (int i = 0; i < subTrees.Count; i++) depth = Math.Max(depth, (ushort)subTrees[i].GetDepth());
+        if (subtrees != null) {
+          for (int i = 0; i < subtrees.Count; i++) depth = Math.Max(depth, (ushort)subtrees[i].GetDepth());
         }
         depth++;
@@ -128 +128 @@
     public int SubtreesCount {
       get {
-        if (subTrees == null) return 0;
-        return subTrees.Count;
+        if (subtrees == null) return 0;
+        return subtrees.Count;
       }
     }
 
-    public virtual ISymbolicExpressionTreeNode GetSubTree(int index) {
-      return subTrees[index];
+    public virtual ISymbolicExpressionTreeNode GetSubtree(int index) {
+      return subtrees[index];
     }
-    public virtual int IndexOfSubTree(ISymbolicExpressionTreeNode tree) {
-      return subTrees.IndexOf(tree);
+    public virtual int IndexOfSubtree(ISymbolicExpressionTreeNode tree) {
+      return subtrees.IndexOf(tree);
     }
-    public virtual void AddSubTree(ISymbolicExpressionTreeNode tree) {
-      subTrees.Add(tree);
+    public virtual void AddSubtree(ISymbolicExpressionTreeNode tree) {
+      subtrees.Add(tree);
       tree.Parent = this;
       ResetCachedValues();
     }
-    public virtual void InsertSubTree(int index, ISymbolicExpressionTreeNode tree) {
-      subTrees.Insert(index, tree);
+    public virtual void InsertSubtree(int index, ISymbolicExpressionTreeNode tree) {
+      subtrees.Insert(index, tree);
       tree.Parent = this;
       ResetCachedValues();
     }
-    public virtual void RemoveSubTree(int index) {
-      subTrees[index].Parent = null;
-      subTrees.RemoveAt(index);
+    public virtual void RemoveSubtree(int index) {
+      subtrees[index].Parent = null;
+      subtrees.RemoveAt(index);
       ResetCachedValues();
     }
@@ -163 +163 @@
     public void ForEachNodePrefix(Action<ISymbolicExpressionTreeNode> a) {
       a(this);
-      if (SubTrees != null) {
-        foreach (var subtree in SubTrees) {
+      if (Subtrees != null) {
+        foreach (var subtree in Subtrees) {
           subtree.ForEachNodePrefix(a);
         }
@@ -177 +177 @@
 
     public void ForEachNodePostfix(Action<ISymbolicExpressionTreeNode> a) {
-      if (SubTrees != null) {
-        foreach (var subtree in SubTrees) {
+      if (Subtrees != null) {
+        foreach (var subtree in Subtrees) {
           subtree.ForEachNodePostfix(a);
         }