Changeset 12951 for branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/TreeMatching

Timestamp:

09/15/15 00:10:33 (9 years ago)

Author:

bburlacu

Message:

#1772:

• Slight refactor in QueryMatch.cs
• Added a parameter to the genealogy analyzer for removing older generations from the graph (useful to conserve memory in experiments)
• Updated wildcard nodes (added persistence & cloning)
• Implemented diversification strategy based on schema frequencies & phenotypic similarity as a separate operator (for now keep also the analyzer)
• Updated license headers
• Added QueryMatch performance test (to be expanded)

File:

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

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

@@ -42 +42 @@
     public QueryMatch(ISymbolicExpressionTreeNodeEqualityComparer comparer) {
       this.comparer = comparer;
+    }
+
+    public bool Match(ISymbolicExpressionTree data, ISymbolicExpressionTree query) {
+      return Match(data.Root.GetSubtree(0).GetSubtree(0), query.Root.GetSubtree(0).GetSubtree(0));
     }
 
@@ -100 +104 @@
         if (qTree.Index < qHedge.Index) {
           var rtop = Rtop(qTree.Next, qHedge);
-          while (rtop.Index < qHedge.Next.Index && qHedge.Index < rtop.LastSibling.Index) {
+          while (rtop.Index < int.MaxValue && qHedge.Index < rtop.LastSibling.Index) {
             qTree = Tmatch(d, rtop.Next, rtop.LastSibling);
             rtop = Rtop(qTree.Next, qHedge);
@@ -108 +112 @@
         } else {
           var rtop = Rtop(qHedge.Next, qTree);
-          while (rtop.Index < qTree.Next.Index && qTree.Index < rtop.LastSibling.Index) {
+          while (rtop.Index < int.MaxValue && qTree.Index < rtop.LastSibling.Index) {
             qHedge = Hmatch(d.PreviousSibling, rtop.Next, rtop.LastSibling);
             rtop = Rtop(qHedge.Next, qTree);
@@ -123 +127 @@
         return hUntil;
       if (hFrom.Index > hUntil.Index)
-        return hFrom.Next;
+        return new NodeInfo { Node = null, Index = int.MaxValue };
       // let u be the highest ancestor of hUntil that has a previous sibling s such that s >= hFrom
       // if no such u exists, then Rtop(hFrom, hUntil) = hUntil. Otherwise, rtop(hFrom, hUntil) = s
-      if (hUntil.Parent == null)
-        return hUntil;
-
       NodeInfo rtop = null;
       List<NodeInfo> ancestors = hUntil.Ancestors.ToList();