Changeset 13892 for branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic

Timestamp:

06/12/16 22:34:22 (9 years ago)

Author:

bburlacu

Message:

#1772: Fix bug in tree matching with wildcards (used by the genealogy graph view instead of the query match) and improved subtree selection and matching functionality in the genealogy graph view.

File:

• branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/TreeMatching/SymbolicExpressionTreeMatching.cs (modified) (2 diffs)

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/TreeMatching/SymbolicExpressionTreeMatching.cs

@@ -42 +42 @@
       // we can have multiple matches of the same node
 
-      return root.IterateNodesBreadth().Where(n => n.GetLength() >= fragmentLength && Match(n, subtree, comp) == fragmentLength);
+      return root.IterateNodesBreadth().Where(n => n.GetLength() >= fragmentLength && Match(n, subtree, comp) >= fragmentLength);
     }
 
@@ -56 +56 @@
       // AnySubtree wildcards mach everything
       if (a is AnySubtree)
-        return b.GetLength();
+        return 1;
       if (b is AnySubtree)
-        return a.GetLength();
+        return 1;
 
       int m = a.SubtreeCount;