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

Timestamp:

09/07/15 10:29:13 (9 years ago)

Author:

bburlacu

Message:

#1772: Forgot to remove unused parameter.

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

@@ -76 +76 @@
     }
 
-    private NodeInfo Tmatch(NodeInfo d, NodeInfo qFrom, NodeInfo qUntil, int tab = 0) {
-      NodeInfo qBest = d.IsLeaf ? qFrom.Previous : Hmatch(d.LastChild, qFrom, qUntil, tab + 1);
+    private NodeInfo Tmatch(NodeInfo d, NodeInfo qFrom, NodeInfo qUntil) {
+      NodeInfo qBest = d.IsLeaf ? qFrom.Previous : Hmatch(d.LastChild, qFrom, qUntil);
       var next = qBest.Next;
       if (next.Index <= qUntil.Index && AreMatching(d, next)) {
@@ -83 +83 @@
         next = qBest.Next;
         var lastSibling = qBest.LastSibling;
-        return next.Index <= lastSibling.Index ? Tmatch(d, next, lastSibling, tab + 1) : qBest;
+        return next.Index <= lastSibling.Index ? Tmatch(d, next, lastSibling) : qBest;
       }
       return qBest;
     }
 
-    private NodeInfo Hmatch(NodeInfo d, NodeInfo qFrom, NodeInfo qUntil, int tab = 0) {
+    private NodeInfo Hmatch(NodeInfo d, NodeInfo qFrom, NodeInfo qUntil) {
       if (d.IsFirstSibling)
-        return Tmatch(d, qFrom, qUntil, tab + 1);
-
-      var qHedge = Hmatch(d.PreviousSibling, qFrom, qUntil, tab + 1);
-      var qTree = Tmatch(d, qFrom, qUntil, tab + 1);
+        return Tmatch(d, qFrom, qUntil);
+
+      var qHedge = Hmatch(d.PreviousSibling, qFrom, qUntil);
+      var qTree = Tmatch(d, qFrom, qUntil);
 
       for (;;) {
@@ -99 +99 @@
           return qHedge;
         if (qTree.Index < qHedge.Index) {
-          var rtop = Rtop(qTree.Next, qHedge, tab);
+          var rtop = Rtop(qTree.Next, qHedge);
           while (rtop.Index < qHedge.Next.Index && qHedge.Index < rtop.LastSibling.Index) {
-            qTree = Tmatch(d, rtop.Next, rtop.LastSibling, tab + 1);
-            rtop = Rtop(qTree.Next, qHedge, tab);
+            qTree = Tmatch(d, rtop.Next, rtop.LastSibling);
+            rtop = Rtop(qTree.Next, qHedge);
           }
           if (qTree.Index <= qHedge.Index)
             return qHedge;
         } else {
-          var rtop = Rtop(qHedge.Next, qTree, tab);
+          var rtop = Rtop(qHedge.Next, qTree);
           while (rtop.Index < qTree.Next.Index && qTree.Index < rtop.LastSibling.Index) {
-            qHedge = Hmatch(d.PreviousSibling, rtop.Next, rtop.LastSibling, tab + 1);
-            rtop = Rtop(qHedge.Next, qTree, tab);
+            qHedge = Hmatch(d.PreviousSibling, rtop.Next, rtop.LastSibling);
+            rtop = Rtop(qHedge.Next, qTree);
           }
           if (qHedge.Index <= qTree.Index)
@@ -119 +119 @@
 
     // returns the rightmost node from the topmost nodes in the interval [hFrom, hUntil]
-    private NodeInfo Rtop(NodeInfo hFrom, NodeInfo hUntil, int tab = 0) {
+    private NodeInfo Rtop(NodeInfo hFrom, NodeInfo hUntil) {
       if (hFrom == hUntil)
         return hUntil;