Changeset 3338 for trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/SymbolicExpressionTree.cs

Timestamp:

04/13/10 20:44:31 (14 years ago)

Author:

gkronber

Message:

Fixed bugs related to dynamic symbol constraints with ADFs. #290 (Implement ADFs)

File:

• trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/SymbolicExpressionTree.cs (modified) (3 diffs)

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

@@ -50 +50 @@
     }
 
-    [Storable]
-    private Dictionary<int, IEnumerable<string>> allowedFunctionsInBranch;
-
     public int Size {
       get {
@@ -67 +64 @@
     public SymbolicExpressionTree()
       : base() {
-      allowedFunctionsInBranch = new Dictionary<int, IEnumerable<string>>();
     }
 
     public SymbolicExpressionTree(SymbolicExpressionTreeNode root)
       : base() {
-      allowedFunctionsInBranch = new Dictionary<int, IEnumerable<string>>();
     }
 
     public IEnumerable<SymbolicExpressionTreeNode> IterateNodesPrefix() {
-      return IterateNodesPrefix(root);
-    }
-    private IEnumerable<SymbolicExpressionTreeNode> IterateNodesPrefix(SymbolicExpressionTreeNode node) {
-      yield return node;
-      foreach (var subtree in node.SubTrees) {
-        foreach (var n in IterateNodesPrefix(subtree))
-          yield return n;
-      }
+      return root.IterateNodesPrefix();
     }
     public IEnumerable<SymbolicExpressionTreeNode> IterateNodesPostfix() {
-      return IterateNodesPostfix(root);
+      return root.IterateNodesPostfix();
     }
-    private IEnumerable<SymbolicExpressionTreeNode> IterateNodesPostfix(SymbolicExpressionTreeNode node) {
-      foreach (var subtree in node.SubTrees) {
-        foreach (var n in IterateNodesPrefix(subtree))
-          yield return n;
+
+    public SymbolicExpressionTreeNode GetTopLevelBranchOf(SymbolicExpressionTreeNode node) {
+      foreach (var branch in root.SubTrees) {
+        if (branch.IterateNodesPrefix().Contains(node)) return branch;
       }
-      yield return node;
+      throw new ArgumentException("Node was not found in tree.");
     }
 
@@ -101 +89 @@
       clone.ReadOnlyView = ReadOnlyView;
       clone.root = (SymbolicExpressionTreeNode)this.root.Clone();
-      clone.allowedFunctionsInBranch = new Dictionary<int, IEnumerable<string>>(allowedFunctionsInBranch);
       return clone;
+    }
+
+    public bool IsValidExpression() {
+      if (root.Symbol != root.Grammar.StartSymbol) return false;
+      foreach (var subtree in root.SubTrees)
+        if (subtree.Grammar == root.Grammar) return false;
+      return root.IsValidTree();
     }
   }