Changeset 3486 for trunk/sources

Timestamp:

04/22/10 09:32:46 (15 years ago)

Author:

gkronber

Message:

Bug fixes in persistence #937 (Data types and operators for symbolic expression tree encoding)

Location:

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3

Files:

• SymbolicExpressionTreeNode.cs (modified) (4 diffs)
• SymbolicExpressionTreeTopLevelNode.cs (modified) (1 diff)
• Symbols/ArgumentTreeNode.cs (modified) (1 diff)

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

@@ -51 +51 @@
     }
 
-    public SymbolicExpressionTreeNode() { }
+    public SymbolicExpressionTreeNode() {
+      // don't allocate subtrees list here!
+      // because we don't want to allocate it in terminal nodes
+    }
 
     public SymbolicExpressionTreeNode(Symbol symbol) {
@@ -64 +67 @@
       foreach (var subtree in original.SubTrees) {
         AddSubTree((SymbolicExpressionTreeNode)subtree.Clone());
+      }
+    }
+
+    [StorableHook(HookType.AfterDeserialization)]
+    private void AfterDeserializationHook() {
+      foreach (var subtree in SubTrees) {
+        subtree.Parent = this;
       }
     }
@@ -112 +122 @@
     public IEnumerable<SymbolicExpressionTreeNode> IterateNodesPrefix() {
       yield return this;
-      foreach (var subtree in subTrees) {
-        foreach (var n in subtree.IterateNodesPrefix())
-          yield return n;
+      if (SubTrees != null) {
+        foreach (var subtree in SubTrees) {
+          foreach (var n in subtree.IterateNodesPrefix())
+            yield return n;
+        }
       }
     }
 
     public IEnumerable<SymbolicExpressionTreeNode> IterateNodesPostfix() {
-      foreach (var subtree in subTrees) {
-        foreach (var n in subtree.IterateNodesPrefix())
-          yield return n;
+      if (SubTrees != null) {
+        foreach (var subtree in SubTrees) {
+          foreach (var n in subtree.IterateNodesPrefix())
+            yield return n;
+        }
       }
       yield return this;
@@ -146 +160 @@
       return Symbol.Name;
     }
-
   }
 }

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

@@ -44 +44 @@
     }
 
+    [Storable]
     private ISymbolicExpressionGrammar grammar;
-
     internal override ISymbolicExpressionGrammar Grammar {
-      get {
-        return grammar;
-      }
-      set {
-        grammar = value;
-      }
+      get { return grammar; }
+      set { grammar = value; }
     }
 

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/Symbols/ArgumentTreeNode.cs

@@ -24 +24 @@
 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Symbols {
   [StorableClass]
-  public sealed class ArgumentTreeNode : SymbolicExpressionTreeNode {
+  public sealed class ArgumentTreeNode : SymbolicExpressionTreeTerminalNode {
     internal new Argument Symbol {
       get { return (Argument)base.Symbol; }