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

Timestamp:

02/17/11 13:51:04 (14 years ago)

Author:

gkronber

Message:

#1418 Fixed compiler errors in symbolic expression tree encoding

File:

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

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

@@ -31 +31 @@
   public class SymbolicExpressionTreeNode : DeepCloneable, ISymbolicExpressionTreeNode {
     [Storable]
-    private IList<SymbolicExpressionTreeNode> subTrees;
+    private IList<ISymbolicExpressionTreeNode> subTrees;
     [Storable]
-    private Symbol symbol;
+    private ISymbol symbol;
 
     // cached values to prevent unnecessary tree iterations
@@ -39 +39 @@
     private ushort height;
 
-    public Symbol Symbol {
+    public ISymbol Symbol {
       get { return symbol; }
       protected set { symbol = value; }
@@ -45 +45 @@
 
     // parent relation is not persisted or cloned (will be set on AddSubtree or RemoveSubtree)
-    private SymbolicExpressionTreeNode parent;
-    internal SymbolicExpressionTreeNode Parent {
+    private ISymbolicExpressionTreeNode parent;
+    public ISymbolicExpressionTreeNode Parent {
       get { return parent; }
       set { parent = value; }
@@ -56 +56 @@
       : base() {
       symbol = original.symbol; // symbols are reused
-      subTrees = new List<SymbolicExpressionTreeNode>(original.SubTrees.Count);
-      foreach (var subtree in original.SubTrees) {
+      subTrees = new List<ISymbolicExpressionTreeNode>(original.subTrees.Count);
+      foreach (var subtree in original.subTrees) {
         var clonedSubTree = cloner.Clone(subtree);
         subTrees.Add(clonedSubTree);
@@ -73 +73 @@
     }
 
-    public SymbolicExpressionTreeNode(Symbol symbol)
+    public SymbolicExpressionTreeNode(ISymbol symbol)
       : base() {
-      subTrees = new List<SymbolicExpressionTreeNode>(3);
+      subTrees = new List<ISymbolicExpressionTreeNode>(3);
       this.symbol = symbol;
     }
@@ -82 +82 @@
     [StorableHook(HookType.AfterDeserialization)]
     private void AfterDeserialization() {
-      foreach (var subtree in SubTrees) {
+      foreach (var subtree in subTrees) {
         subtree.Parent = this;
       }
@@ -91 +91 @@
     }
 
-    public virtual IList<SymbolicExpressionTreeNode> SubTrees {
+    public virtual IEnumerable<ISymbolicExpressionTreeNode> SubTrees {
       get { return subTrees; }
     }
@@ -103 +103 @@
       else {
         size = 1;
-        if (SubTrees != null) {
-          for (int i = 0; i < SubTrees.Count; i++) {
-            checked { size += (ushort)SubTrees[i].GetSize(); }
+        if (subTrees != null) {
+          for (int i = 0; i < subTrees.Count; i++) {
+            checked { size += (ushort)subTrees[i].GetSize(); }
           }
         }
@@ -115 +115 @@
       if (height > 0) return height;
       else {
-        if (SubTrees != null) {
-          for (int i = 0; i < SubTrees.Count; i++) height = Math.Max(height, (ushort)SubTrees[i].GetHeight());
+        if (subTrees != null) {
+          for (int i = 0; i < subTrees.Count; i++) height = Math.Max(height, (ushort)subTrees[i].GetHeight());
         }
         height++;
@@ -126 +126 @@
     public virtual void ShakeLocalParameters(IRandom random, double shakingFactor) { }
 
-    public virtual void AddSubTree(SymbolicExpressionTreeNode tree) {
-      SubTrees.Add(tree);
+    public virtual ISymbolicExpressionTreeNode GetSubTree(int index) {
+      return subTrees[index];
+    }
+    public virtual int IndexOfSubTree(ISymbolicExpressionTreeNode tree) {
+      return subTrees.IndexOf(tree);
+    }
+    public virtual void AddSubTree(ISymbolicExpressionTreeNode tree) {
+      subTrees.Add(tree);
       tree.Parent = this;
       ResetCachedValues();
     }
-
-    public virtual void InsertSubTree(int index, SymbolicExpressionTreeNode 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);
+      subTrees[index].Parent = null;
+      subTrees.RemoveAt(index);
       ResetCachedValues();
     }
 
-    public IEnumerable<SymbolicExpressionTreeNode> IterateNodesPrefix() {
-      List<SymbolicExpressionTreeNode> list = new List<SymbolicExpressionTreeNode>();
+    public IEnumerable<ISymbolicExpressionTreeNode> IterateNodesPrefix() {
+      List<ISymbolicExpressionTreeNode> list = new List<ISymbolicExpressionTreeNode>();
       ForEachNodePrefix((n) => list.Add(n));
       return list;
     }
 
-    public void ForEachNodePrefix(Action<SymbolicExpressionTreeNode> a) {
+    public void ForEachNodePrefix(Action<ISymbolicExpressionTreeNode> a) {
       a(this);
       if (SubTrees != null) {
-        for (int i = 0; i < SubTrees.Count; i++) {
-          SubTrees[i].ForEachNodePrefix(a);
-        }
-      }
-    }
-
-    public IEnumerable<SymbolicExpressionTreeNode> IterateNodesPostfix() {
-      List<SymbolicExpressionTreeNode> list = new List<SymbolicExpressionTreeNode>();
+        foreach (var subtree in SubTrees) {
+          subtree.ForEachNodePrefix(a);
+        }
+      }
+    }
+
+    public IEnumerable<ISymbolicExpressionTreeNode> IterateNodesPostfix() {
+      List<ISymbolicExpressionTreeNode> list = new List<ISymbolicExpressionTreeNode>();
       ForEachNodePostfix((n) => list.Add(n));
       return list;
     }
 
-    public void ForEachNodePostfix(Action<SymbolicExpressionTreeNode> a) {
+    public void ForEachNodePostfix(Action<ISymbolicExpressionTreeNode> a) {
       if (SubTrees != null) {
-        for (int i = 0; i < SubTrees.Count; i++) {
-          SubTrees[i].ForEachNodePostfix(a);
+        foreach (var subtree in SubTrees) {
+          subtree.ForEachNodePostfix(a);
         }
       }
@@ -190 +194 @@
     private void ResetCachedValues() {
       size = 0; height = 0;
-      if (parent != null) parent.ResetCachedValues();
+      SymbolicExpressionTreeNode parentNode = parent as SymbolicExpressionTreeNode;
+      if (parentNode != null) parentNode.ResetCachedValues();
     }
   }