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

Timestamp:

04/16/10 12:12:29 (14 years ago)

Author:

gkronber

Message:

Changed way the grammar is stored in tree nodes to make it more efficient and fixed bugs in symbolic expression tree operators. #290 (Implement ADFs)

File:

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

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

@@ -37 +37 @@
     [Storable]
     private Symbol symbol;
+    //[Storable]
+    private SymbolicExpressionTreeNode parent;
 
     public SymbolicExpressionTreeNode() {
@@ -51 +53 @@
       symbol = original.symbol;
       subTrees = new List<SymbolicExpressionTreeNode>();
-      grammar = original.grammar;
       foreach (var subtree in original.SubTrees) {
-        SubTrees.Add((SymbolicExpressionTreeNode)subtree.Clone());
+        AddSubTree((SymbolicExpressionTreeNode)subtree.Clone());
       }
     }
@@ -70 +71 @@
     }
 
-    private ISymbolicExpressionGrammar grammar;
-    public virtual ISymbolicExpressionGrammar Grammar {
-      get { return grammar; }
-      set {
-        grammar = value;
-        foreach (var subtree in subTrees)
-          subtree.Grammar = value;
-      }
+    internal SymbolicExpressionTreeNode Parent {
+      get { return parent; }
+      set { parent = value; }
+    }
+
+    internal virtual ISymbolicExpressionGrammar Grammar {
+      get { return parent.Grammar; }
+      set { throw new NotSupportedException("Grammar can be set only for SymbolicExpressionTreeTopLevelNodes."); }
     }
 
@@ -96 +97 @@
 
     public virtual void AddSubTree(SymbolicExpressionTreeNode tree) {
-      SubTrees.Add(tree);
-      //if (tree != null) 
-      tree.Grammar = Grammar;
+      subTrees.Add(tree);
+      tree.Parent = this;
     }
 
     public virtual void InsertSubTree(int index, SymbolicExpressionTreeNode tree) {
-      SubTrees.Insert(index, tree);
-      //if (tree != null) 
-      tree.Grammar = Grammar;
+      subTrees.Insert(index, tree);
+      tree.Parent = this;
     }
 
     public virtual void RemoveSubTree(int index) {
-      //if (SubTrees[index] != null)
-      SubTrees[index].Grammar = null;
-      SubTrees.RemoveAt(index);
+      subTrees[index].Parent = null;
+      subTrees.RemoveAt(index);
     }