Added TaggedFoo stuff

git-svn-id: svn+ssh://idea.nguyen.vg/svn/sxsi/trunk/XMLTree@230 3cdefd35-fc62-479d-8e8d-bae585ffb9ca

diff --git a/XMLTree.cpp b/XMLTree.cpp
index 057a117..95546fd 100644 (file)
--- a/XMLTree.cpp
+++ b/XMLTree.cpp
@@ -427,6 +427,14 @@ range XMLTree::DocIds(treeNode x)
     }\r
 \r
     range r;\r
+    if (x == NULLT)\r
+      {\r
+       r.min = NULLT;\r
+       r.max = NULLT;\r
+       return r;\r
+      };\r
+        \r
+      \r
     if (indexing_empty_texts) { // faster, no rank needed\r
        r.min = x;\r
        r.max = x+2*subtree_size(Par, x)-2;\r
@@ -489,9 +497,9 @@ treeNode XMLTree::NextSibling(treeNode x)
        fprintf(stderr, "Error: data structure has not been constructed properly\n");\r
        exit(1);\r
     }\r
-    if (x == Root())\r
+    if (x == Root() || x==NULLT)\r
       return NULLT;\r
- \r
+    \r
     return next_sibling(Par, x);\r
  }\r
 \r
@@ -552,25 +560,151 @@ treeNode XMLTree::TaggedDesc(treeNode x, TagType tag)
     else return y;\r
  }\r
 \r
+treeNode XMLTree::TaggedDescOnly(treeNode x,TagType *desctags, unsigned int dtlen)\r
+{\r
+\r
+  treeNode res,y;\r
+  if (isleaf(Par,x))\r
+    return NULLT;\r
+  \r
+  res=NULLT;\r
+  for (unsigned int i = 0; i < dtlen; i ++ )\r
+    {\r
+      y = TaggedDesc(x,desctags[i]);\r
+      res = (res == NULLT) || (( res != NULLT) && (y =! NULLT) && y < res) ? y : res;\r
+      \r
+    };\r
+  \r
+  return res;\r
+  \r
+}\r
+\r
+\r
+treeNode XMLTree::TaggedBelow(treeNode x, TagType *childtags, unsigned int ctlen,\r
+                             TagType *desctags, unsigned int dtlen)\r
+{\r
+  treeNode fs,y,res;\r
+  TagType tag;\r
+\r
+  if (isleaf(Par,x))\r
+    return NULLT;\r
+  \r
+  res = NULLT;\r
+  fs = first_child(Par,x);\r
+  while (fs != NULLT) {\r
+    tag = get_field(tags_fix,tags_blen,node2tagpos(fs));\r
+        \r
+    /* Check for first_child */\r
+    for (unsigned int i = 0; i < ctlen; i++) {\r
+      if (childtags[i] == tag)\r
+       return fs;\r
+    };\r
+    \r
+    for (unsigned int i = 0; i < dtlen; i++)\r
+      if (desctags[i] == tag)\r
+       return fs;  \r
+    \r
+    /* check in the descendants */\r
+    res = NULLT;\r
+    for (unsigned int i = 0; i < dtlen; i ++ ){\r
+      /* maybe inline by hand */\r
+      y = TaggedDesc(fs,desctags[i]);\r
+      res = (res==NULLT || (y != NULLT) &&(y < res)) ? y : res;   \r
+    };\r
+    if (res != NULLT)\r
+      return res;\r
+    \r
+    fs = next_sibling(Par,fs);\r
+  };\r
+  return res;\r
+    \r
+}\r
+treeNode XMLTree::TaggedFollOnly(treeNode x,TagType *folltags, unsigned int ftlen,treeNode root)\r
+{\r
+\r
+  treeNode res,y,lim;\r
+  lim = find_close(Par,root);   \r
+  res=NULLT;\r
+  for (unsigned int i = 0; i < ftlen; i ++ )\r
+    {\r
+      y = TaggedFoll(x,folltags[i]);\r
+      res = (res == NULLT) || (( res != NULLT) && (y =! NULLT) && y < res) ? y : res;\r
+      \r
+    };\r
+  \r
+  return res < lim ? res : NULLT;\r
+  \r
+}\r
+\r
+treeNode XMLTree::TaggedDescOrFollOnly(treeNode x,TagType *folltags, unsigned int ftlen,treeNode root)\r
+{\r
+\r
+  treeNode res,y,lim;\r
+  int r,s;\r
+  lim = find_close(Par,root);   \r
+  res=NULLT;\r
+  for (unsigned int i = 0; i < ftlen; i ++ )\r
+    {\r
+\r
+      r = (int) Tags->rank(folltags[i], node2tagpos(x));\r
+      s = (int) Tags->select(folltags[i], r+1);\r
+      if (s == -1) \r
+       y = NULLT; // there is no such node\r
+      else {\r
+       y = tagpos2node(s); \r
+       if (y >= lim)\r
+         y = NULLT;\r
+      };\r
+      res = (res == NULLT) || (( res != NULLT) && (y =! NULLT) && y < res) ? y : res;\r
+      \r
+    };\r
+  \r
+  return res < lim ? res : NULLT;\r
+  \r
+}\r
+\r
+\r
 // TaggedNext(x,tag): returns the first node tagged tag with larger preorder than x \r
 // Returns NULLT if there is none.\r
-treeNode XMLTree::TaggedNext(treeNode x, TagType tag) \r
+treeNode XMLTree::TaggedNext(treeNode x, TagType *childtags, unsigned int ctlen,\r
+                            TagType *folltags, unsigned int flen,treeNode root)\r
  {\r
-    if (!finished) {\r
-       fprintf(stderr, "Error: data structure has not been constructed properly\n");\r
-       exit(1);\r
-    }\r
+   treeNode y,old_y,lim,res;\r
+   TagType tag;\r
+   if (x == NULLT || x == Root())\r
+     return NULLT;\r
 \r
-    int r, s;\r
-    treeNode y;\r
-    if (x==NULLT)\r
-      return NULLT;\r
 \r
-    r = (int) Tags->rank(tag, node2tagpos(x));\r
-    s = (int) Tags->select(tag, r+1);\r
-    if (s == -1) return NULLT; // there is no such node\r
-    y = tagpos2node(s); // transforms the tag position into a node position  \r
-    return (y<=x ? NULLT : y);\r
+   lim = find_close(Par,root);   \r
+\r
+   res = NULLT;\r
+  \r
+   y = next_sibling(Par,x);\r
+   while (y != NULLT) {\r
+     tag = get_field(tags_fix,tags_blen,node2tagpos(y));\r
+     for(unsigned int i = 0; i < ctlen;i++)\r
+       if (childtags[i] == tag)\r
+        return y;\r
+     \r
+     for(unsigned int i = 0; i < flen;i++)\r
+       if (folltags[i] == tag)\r
+        return y;\r
+\r
+     res = TaggedBelow(y,NULL,0,folltags,flen);\r
+     if (res != NULLT)\r
+       return res;\r
+     \r
+     y = next_sibling(Par,y);\r
+   };\r
+   //Found nothing in the following sibling of x.\r
+   res = NULLT;\r
+   for(unsigned int i = 0; i < flen;i++){\r
+     y = TaggedFoll(x,folltags[i]);\r
+     res = (y!= x && (res == NULLT || (y != NULLT && y < res)))? y : res;\r
+   };\r
+  \r
+   return res < lim ? res : NULLT;\r
+   \r
  }\r
 \r
 \r
@@ -786,6 +920,29 @@ treeNode XMLTree::ParentNode(DocID d)
        return (treeNode)s;\r
      \r
  }\r
+treeNode XMLTree::PrevNode(DocID d) \r
+ {\r
+    if (!finished) {\r
+       fprintf(stderr, "Error: data structure has not been constructed properly\n");\r
+       exit(1);\r
+    }\r
+    \r
+    if (d == NULLT)\r
+      return NULLT;\r
+    \r
+    int s;\r
+    \r
+    if (indexing_empty_texts) s = d;\r
+    else s = EBVector->select1(d+1);\r
+    if (s == -1)\r
+      return NULLT;\r
+    \r
+    if (inspect(Par,s) == CP) // is a closing parenthesis\r
+      return find_open(Par, s);\r
+    else // is an opening parenthesis\r
+      return NULLT;\r
+    \r
+ }\r
 \r
 \r
 // OpenDocument(empty_texts): it starts the construction of the data structure for\r

diff --git a/XMLTree.h b/XMLTree.h
index 2e9e222..42e02b7 100644 (file)
--- a/XMLTree.h
+++ b/XMLTree.h
@@ -207,9 +207,21 @@ public:
     * is none. */\r
    treeNode TaggedDesc(treeNode x, TagType tag);\r
 \r
-   /** TaggedNext(x,tag): returns the first node tagged tag with larger \r
-    * preorder than x. Returns NULT if there is none. */\r
-   treeNode TaggedNext(treeNode x, TagType tag);\r
+\r
+   treeNode TaggedBelow(treeNode x, TagType *childtags, unsigned int ctlen,\r
+                                TagType *desctags, unsigned int dtlen);\r
+   \r
+   treeNode TaggedNext(treeNode x, TagType *childtags, unsigned int ctlen,\r
+                               TagType *folltags, unsigned int flen,treeNode root);\r
+\r
+   treeNode TaggedDescOnly(treeNode x, TagType *desctags, unsigned int dtlen);\r
+   \r
+   treeNode TaggedDescOrFollOnly(treeNode x, TagType *folltags, unsigned int flen,\r
+                          treeNode root);\r
+\r
+   treeNode TaggedFollOnly(treeNode x, TagType *folltags, unsigned int flen,\r
+                          treeNode root);\r
+   \r
 \r
    /** TaggedPrec(x,tag): returns the first node tagged tag with smaller \r
     * preorder than x and not an ancestor of x. Returns NULLT if there \r
@@ -220,6 +232,7 @@ public:
     * preorder than x and not in the subtree of x. Returns NULLT if there \r
     * is none. */\r
    treeNode TaggedFoll(treeNode x, TagType tag);\r
+     \r
   \r
    /** TaggedFollowingSibling(x,tag) */\r
    treeNode TaggedFollowingSibling(treeNode x, TagType tag);\r
@@ -250,6 +263,7 @@ public:
    \r
    /** ParentNode(d): returns the parent node of document identifier d. */\r
    treeNode ParentNode(DocID d);\r
+   treeNode PrevNode(DocID d);\r
 \r
    /** OpenDocument(empty_texts,sample_rate_text,dtc): initilizes the construction\r
     * of the data structure for the XML document. Parameter empty_texts \r