Added TaggedNext

[SXSI/XMLTree.git] / XMLTree.cpp

diff --git a/XMLTree.cpp b/XMLTree.cpp
index dbc4d83..4ddec01 100644 (file)
--- a/XMLTree.cpp
+++ b/XMLTree.cpp
@@ -184,7 +184,6 @@ XMLTree *XMLTree::Load(unsigned char *filename, int sample_rate_text)
     \r
     // loads the tags\r
     XML_Tree->Tags = static_sequence::load(fp);\r
-\r
     s_tree+= XML_Tree->Tags->size();\r
 \r
     s_text = ftell(fp);\r
@@ -201,6 +200,10 @@ XMLTree *XMLTree::Load(unsigned char *filename, int sample_rate_text)
     fclose(fp);\r
 \r
     std::cerr << "Tree part is " << s_tree/1024 << " Kbytes,\n"\r
+             << "with node->tagid part " << XML_Tree->Tags->size()/1024 << "Kbytes \n"\r
+             << "size of Tag part : " << XML_Tree->Tags->length () << " elements\n"\r
+             << "sizof(unsigned int)* " <<  XML_Tree->Tags->length () << " = " << \r
+      sizeof(unsigned int) * XML_Tree->Tags->length () / 1024 << " Kbytes\n"\r
              << "Tag part is " << s_tags/1024 << " Kbytes,\n"\r
              << "Text collection is " << s_text/1024 << " Kbytes \n";\r
     return XML_Tree;\r
@@ -265,6 +268,9 @@ int XMLTree::SubtreeTags(treeNode x, TagType tag)
        fprintf(stderr, "Error: data structure has not been constructed properly\n");\r
        exit(1);\r
     }\r
+    if (x == Root())\r
+      x = first_child(Par,x);\r
+    \r
 \r
     int s = x + 2*subtree_size(Par, x) - 1;\r
  \r
@@ -365,7 +371,7 @@ TagType XMLTree::Tag(treeNode x)
        fprintf(stderr, "Error: data structure has not been constructed properly\n");\r
        exit(1);\r
     }\r
-\r
+    \r
     return Tags->access(node2tagpos(x));\r
  }\r
 \r
@@ -493,6 +499,9 @@ treeNode XMLTree::TaggedDesc(treeNode x, TagType tag)
 \r
     int r, s;\r
     treeNode y;\r
+    if (isleaf(Par,x))\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
@@ -501,6 +510,28 @@ treeNode XMLTree::TaggedDesc(treeNode x, TagType tag)
     else return y;\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
+ {\r
+    if (!finished) {\r
+       fprintf(stderr, "Error: data structure has not been constructed properly\n");\r
+       exit(1);\r
+    }\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
+ }\r
+\r
+\r
 // TaggedPrec(x,tag): returns the first node tagged tag with smaller preorder than x and not an\r
 // ancestor of x. Returns NULLT if there is none.\r
 treeNode XMLTree::TaggedPrec(treeNode x, TagType tag) \r
@@ -536,6 +567,9 @@ treeNode XMLTree::TaggedFoll(treeNode x, TagType tag)
     }\r
 \r
     int r, s;\r
+    if (x ==NULLT || x == Root()|| (next_sibling(Par,x) == -1 ))\r
+      return NULLT;\r
+\r
     r = (int) Tags->rank(tag, node2tagpos(next_sibling(Par, x))-1);\r
     s = (int) Tags->select(tag, r+1);  // select returns -1 in case that there is no r+1-th tag.\r
     if (s==-1) return NULLT;\r