Changeset 12933 for branches/HeuristicLab.EvolutionTracking

Timestamp:

09/02/15 16:26:23 (9 years ago)

Author:

bburlacu

Message:

#1772: Added a parameter to the tree query matching algorithm to specify whether only strict parent-child pairs in the data tree should be matched with the query (otherwise ancestor-descendant pairs are also considered valid).

File:

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

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

@@ -47 +47 @@
     }
 
+    // whether matching nodes should also have matching parents
+    // in theory, this restricts the matching so that parent-child
+    // pairs in the query tree are matched by parent-child pairs in 
+    // the data tree (and not ancestor-descendant pairs)
+    public bool MatchParents { get; set; }
+
     public QueryMatch(ISymbolicExpressionTreeNodeEqualityComparer comparer) {
       this.comparer = comparer;
@@ -70 +76 @@
     }
 
+    private bool AreMatching(NodeInfo a, NodeInfo b) {
+      bool equals = comparer.Equals(a.Node, b.Node);
+
+      if (equals && MatchParents) {
+        var pa = a.Parent();
+        var pb = b.Parent();
+        if (pa != null && pb != null)
+          return comparer.Equals(pa.Node, pb.Node);
+        if (!(pa == null && pb == null))
+          return false;
+      }
+      return equals;
+    }
+
     private NodeInfo Tmatch(NodeInfo d, NodeInfo qFrom, NodeInfo qUntil, int tab = 0) {
 #if DEBUG
@@ -77 +97 @@
 
       var next = qBest.Next();
-      if (next.Index <= qUntil.Index && comparer.Equals(d.Node, next.Node)) {
+      if (next.Index <= qUntil.Index && AreMatching(d, next)) {
         qBest = next;
         next = qBest.Next();