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

Timestamp:

05/09/12 17:29:33 (12 years ago)

Author:

bburlacu

Message:

#1772: Fixed bug in fragment tracing.

File:

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

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

@@ -92 +92 @@
     // convenience methods for less typing :)
     private static IEnumerator<ISymbolicExpressionTreeNode> Enumerator(this ISymbolicExpressionTree tree) {
-      return tree.IterateNodesPostfix().GetEnumerator();
+      return tree.IterateNodes().GetEnumerator();
     }
     private static IEnumerator<ISymbolicExpressionTreeNode> Enumerator(this ISymbolicExpressionTreeNode tree) {
-      return tree.IterateNodesPostfix().GetEnumerator();
+      return tree.IterateNodes().GetEnumerator();
     }
     // method for breath-width iteration of nodes
-    private static IEnumerable<ISymbolicExpressionTreeNode> IterateNodes(this ISymbolicExpressionTree tree) {
+    public static IEnumerable<ISymbolicExpressionTreeNode> IterateNodes(this ISymbolicExpressionTree tree) {
       return IterateNodes(tree.Root);
     }
@@ -128 +128 @@
     /// <returns>A symbolic expression tree node representing the difference fragment between parent and child</returns>
     public static ISymbolicExpressionTreeNode GetFragmentDiff(ISymbolicExpressionTree parent, ISymbolicExpressionTree child) {
-      var e1 = parent.Enumerator();
-      var e2 = child.Enumerator();
+      var nodes1 = parent.IterateNodes().ToList();
+      var nodes2 = child.IterateNodes().ToList();
+      var e1 = nodes1.AsEnumerable().GetEnumerator();
+      var e2 = nodes2.AsEnumerable().GetEnumerator();
       while (e1.MoveNext() && e2.MoveNext()) {
         var comparer = new SymbolicExpressionTreeNodeComparer((int)SimilarityLevel.Exact);
-        if (!comparer.Equals(e1.Current, e2.Current)) { return e2.Current; } // return the fragment by which child differs from parent
+        if (!comparer.Equals(e1.Current, e2.Current)) {
+          return e2.Current;
+        }
+        //if (!e1.Current.IterateNodes().SequenceEqual(e2.Current.IterateNodes(), comparer)) {
+        //  return e2.Current;
+        //} // return the fragment by which child differs from parent
       }
       return null;
@@ -145 +152 @@
       var comparer = new SymbolicExpressionTreeNodeComparer(mode);
       if (patlen == seqlen) return seq.SequenceEqual(pat, comparer) ? 0 : -1;
-      //int i = patlen;            
-      //while (i <= seqlen) {
-      //  var ch = seq[i - 1];
-      //  if (comparer.Equals(ch, pat.Last()))
-      //    if (seq.Skip(i - patlen).Take(patlen).SequenceEqual(pat, comparer))
-      //      return i - patlen;
-      //  ++i;
-      //}
       for (int i = patlen; i <= seqlen; ++i) {
         if (comparer.Equals(seq[i - 1], pat.Last())) // first check if last element is a match