Changeset 7817 for branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionTreeMatching.cs

Timestamp:

05/15/12 00:21:10 (12 years ago)

Author:

bburlacu

Message:

#1772: Fixed a small bug in the TracingSymbolicExpressionTreeCrossover. Fixed bug in fragment matching code.

File:

• branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionTreeMatching.cs (modified) (2 diffs)

branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionTreeMatching.cs

@@ -70 +70 @@
 
     public static bool ContainsFragment(this ISymbolicExpressionTree tree, ISymbolicExpressionTreeNode fragment, int mode) {
-      var nodes = tree.IterateNodesBreadth() as List<ISymbolicExpressionTreeNode>;
-      var fragments = fragment.IterateNodesBreadth() as List<ISymbolicExpressionTreeNode>;
+      var nodes = tree.IterateNodesPostfix() as List<ISymbolicExpressionTreeNode>;
+      var fragments = fragment.IterateNodesPostfix() as List<ISymbolicExpressionTreeNode>;
       return FindMatch(nodes, fragments, mode) != -1;
     }
@@ -77 +77 @@
     // convenience methods for less typing :)
     private static IEnumerator<ISymbolicExpressionTreeNode> Enumerator(this ISymbolicExpressionTree tree) {
-      return tree.IterateNodesBreadth().GetEnumerator();
+      return tree.IterateNodesPostfix().GetEnumerator();
     }
     private static IEnumerator<ISymbolicExpressionTreeNode> Enumerator(this ISymbolicExpressionTreeNode tree) {
-      return tree.IterateNodesBreadth().GetEnumerator();
+      return tree.IterateNodesPostfix().GetEnumerator();
     }
     public static int FindMatch(ISymbolicExpressionTree a, ISymbolicExpressionTree b, int mode) {
-      var nodesA = a.IterateNodesBreadth() as List<ISymbolicExpressionTreeNode>;
-      var nodesB = b.IterateNodesBreadth() as List<ISymbolicExpressionTreeNode>;
+      var nodesA = a.IterateNodesPostfix() as List<ISymbolicExpressionTreeNode>;
+      var nodesB = b.IterateNodesPostfix() as List<ISymbolicExpressionTreeNode>;
       return FindMatch(nodesA, nodesB, mode);
     }
     public static int FindMatch(ISymbolicExpressionTreeNode a, ISymbolicExpressionTreeNode b, int mode) {
-      var nodesA = a.IterateNodesBreadth() as List<ISymbolicExpressionTreeNode>;
-      var nodesB = b.IterateNodesBreadth() as List<ISymbolicExpressionTreeNode>;
+      var nodesA = a.IterateNodesPostfix() as List<ISymbolicExpressionTreeNode>;
+      var nodesB = b.IterateNodesPostfix() as List<ISymbolicExpressionTreeNode>;
       return FindMatch(nodesA, nodesB, mode);
     }