X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=XMLTree.cpp;h=4ddec0170a5186dc02c43e98ab59e525c89380c2;hb=dd9992dcd5366f37820c24ed7cddf24ecbc0d549;hp=dbc4d83b7eda36016e58519efb55101301c34853;hpb=4dc580ecf57a71c74097fd7adc62e75e23f5298d;p=SXSI%2FXMLTree.git

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