Changeset 12942


Ignore:
Timestamp:
09/07/15 10:29:13 (7 years ago)
Author:
bburlacu
Message:

#1772: Forgot to remove unused parameter.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/TreeMatching/QueryMatch.cs

    r12941 r12942  
    7676    }
    7777
    78     private NodeInfo Tmatch(NodeInfo d, NodeInfo qFrom, NodeInfo qUntil, int tab = 0) {
    79       NodeInfo qBest = d.IsLeaf ? qFrom.Previous : Hmatch(d.LastChild, qFrom, qUntil, tab + 1);
     78    private NodeInfo Tmatch(NodeInfo d, NodeInfo qFrom, NodeInfo qUntil) {
     79      NodeInfo qBest = d.IsLeaf ? qFrom.Previous : Hmatch(d.LastChild, qFrom, qUntil);
    8080      var next = qBest.Next;
    8181      if (next.Index <= qUntil.Index && AreMatching(d, next)) {
     
    8383        next = qBest.Next;
    8484        var lastSibling = qBest.LastSibling;
    85         return next.Index <= lastSibling.Index ? Tmatch(d, next, lastSibling, tab + 1) : qBest;
     85        return next.Index <= lastSibling.Index ? Tmatch(d, next, lastSibling) : qBest;
    8686      }
    8787      return qBest;
    8888    }
    8989
    90     private NodeInfo Hmatch(NodeInfo d, NodeInfo qFrom, NodeInfo qUntil, int tab = 0) {
     90    private NodeInfo Hmatch(NodeInfo d, NodeInfo qFrom, NodeInfo qUntil) {
    9191      if (d.IsFirstSibling)
    92         return Tmatch(d, qFrom, qUntil, tab + 1);
    93 
    94       var qHedge = Hmatch(d.PreviousSibling, qFrom, qUntil, tab + 1);
    95       var qTree = Tmatch(d, qFrom, qUntil, tab + 1);
     92        return Tmatch(d, qFrom, qUntil);
     93
     94      var qHedge = Hmatch(d.PreviousSibling, qFrom, qUntil);
     95      var qTree = Tmatch(d, qFrom, qUntil);
    9696
    9797      for (;;) {
     
    9999          return qHedge;
    100100        if (qTree.Index < qHedge.Index) {
    101           var rtop = Rtop(qTree.Next, qHedge, tab);
     101          var rtop = Rtop(qTree.Next, qHedge);
    102102          while (rtop.Index < qHedge.Next.Index && qHedge.Index < rtop.LastSibling.Index) {
    103             qTree = Tmatch(d, rtop.Next, rtop.LastSibling, tab + 1);
    104             rtop = Rtop(qTree.Next, qHedge, tab);
     103            qTree = Tmatch(d, rtop.Next, rtop.LastSibling);
     104            rtop = Rtop(qTree.Next, qHedge);
    105105          }
    106106          if (qTree.Index <= qHedge.Index)
    107107            return qHedge;
    108108        } else {
    109           var rtop = Rtop(qHedge.Next, qTree, tab);
     109          var rtop = Rtop(qHedge.Next, qTree);
    110110          while (rtop.Index < qTree.Next.Index && qTree.Index < rtop.LastSibling.Index) {
    111             qHedge = Hmatch(d.PreviousSibling, rtop.Next, rtop.LastSibling, tab + 1);
    112             rtop = Rtop(qHedge.Next, qTree, tab);
     111            qHedge = Hmatch(d.PreviousSibling, rtop.Next, rtop.LastSibling);
     112            rtop = Rtop(qHedge.Next, qTree);
    113113          }
    114114          if (qHedge.Index <= qTree.Index)
     
    119119
    120120    // returns the rightmost node from the topmost nodes in the interval [hFrom, hUntil]
    121     private NodeInfo Rtop(NodeInfo hFrom, NodeInfo hUntil, int tab = 0) {
     121    private NodeInfo Rtop(NodeInfo hFrom, NodeInfo hUntil) {
    122122      if (hFrom == hUntil)
    123123        return hUntil;
Note: See TracChangeset for help on using the changeset viewer.