Changeset 3803 for trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding

Timestamp:

05/13/10 20:30:30 (15 years ago)

Author:

gkronber

Message:

Minor efficiency improvements in tree iteration methods. #937

File:

• trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/SymbolicExpressionTreeNode.cs (modified) (1 diff)

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

@@ -121 +121 @@
 
     public IEnumerable<SymbolicExpressionTreeNode> IterateNodesPrefix() {
-      yield return this;
-      if (SubTrees != null) {
-        foreach (var subtree in SubTrees) {
-          foreach (var n in subtree.IterateNodesPrefix())
-            yield return n;
-        }
-      }
+      return (new SymbolicExpressionTreeNode[] { this })
+        .Concat(SubTrees.SelectMany(tree => tree.IterateNodesPrefix()));
     }
 
     public IEnumerable<SymbolicExpressionTreeNode> IterateNodesPostfix() {
-      if (SubTrees != null) {
-        foreach (var subtree in SubTrees) {
-          foreach (var n in subtree.IterateNodesPrefix())
-            yield return n;
-        }
-      }
-      yield return this;
+      return SubTrees.SelectMany(tree => tree.IterateNodesPrefix())
+        .Concat(new SymbolicExpressionTreeNode[] { this });
     }
     public IEnumerable<Symbol> GetAllowedSymbols(int argumentIndex) {