X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=XMLTree.cpp;h=2a1da8446a816ab17117963aea34bc785b4945ca;hb=dc02a833a150dbef202bc14aca74c51360d4a631;hp=70cf4b77847aa58f7bf156e7e98f826bdeafb32e;hpb=deeb5434b7e061741700eff08588539d34b717a6;p=SXSI%2FXMLTree.git

diff --git a/XMLTree.cpp b/XMLTree.cpp
index 70cf4b7..2a1da84 100644
--- a/XMLTree.cpp
+++ b/XMLTree.cpp
@@ -212,11 +212,11 @@ XMLTree *XMLTree::Load(unsigned char *filename, int sample_rate_text)
     s_tree+= XML_Tree->Tags->size();
 
 		/// FIXME:UGLY tests!
-		/*uint * seq = new uint[XML_Tree->tags_len];
+		uint * seq = new uint[XML_Tree->tags_len];
 		for(uint i=0;i<XML_Tree->tags_len;i++)
 			seq[i] = get_field(XML_Tree->tags_fix,XML_Tree->tags_blen,i);
 		cout << "Tags test: " << XML_Tree->Tags->test(seq,XML_Tree->tags_len) << endl;
-		delete [] seq;*/
+		delete [] seq;
 		/// End ugly tests
 
     s_text = ftell(fp);
@@ -357,7 +357,9 @@ bool XMLTree::IsChild(treeNode x, treeNode y)
     if (!is_ancestor(Par, x, y)) return false;
     return depth(Par, x) == (depth(Par, y) + 1);
  }
-
+bool XMLTree::IsFirstChild(treeNode x){
+  return ((x != NULLT)&&(x==Root() || prev_sibling(Par,x) == NULLT));
+}
 // NumChildren(x): number of children of node x. Constant time with the data structure
 // of Sadakane.
 int XMLTree::NumChildren(treeNode x) 
@@ -499,6 +501,14 @@ treeNode XMLTree::FirstChild(treeNode x)
     return first_child(Par, x);
  }
 
+treeNode XMLTree::LastChild(treeNode x) 
+{
+  if (x == Root() || isleaf(Par,x) || x == NULLT)
+    return x;
+  else
+  return find_open(Par,find_close(Par,parent(Par,x))-1);
+}
+
 // NextSibling(x): returns the next sibling of node x, assuming it exists.
 treeNode XMLTree::NextSibling(treeNode x) 
  {
@@ -556,13 +566,14 @@ treeNode XMLTree::TaggedDesc(treeNode x, TagType tag)
        exit(1);
     }
 
-    int r, s;
+    //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);
+		int s = (int) Tags->select_next(tag,node2tagpos(x));
+    /*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
     if (!is_ancestor(Par, x, y)) return NULLT; // the next node tagged tag (in preorder) is not within the subtree of x.
@@ -649,14 +660,15 @@ treeNode XMLTree::TaggedDescOrFollOnly(treeNode x,TagType *folltags, unsigned in
 {
 
   treeNode res,y,lim;
-  int r,s;
+  //int r,s;
   lim = find_close(Par,root);   
   res=NULLT;
   for (unsigned int i = 0; i < ftlen; i ++ )
     {
 
-      r = (int) Tags->rank(folltags[i], node2tagpos(x));
-      s = (int) Tags->select(folltags[i], r+1);
+			int s = (int) Tags->select_next(folltags[i],node2tagpos(x));
+      /*r = (int) Tags->rank(folltags[i], node2tagpos(x));
+      s = (int) Tags->select(folltags[i], r+1);*/
       if (s == -1) 
 	y = NULLT; // there is no such node
       else {
@@ -752,12 +764,13 @@ treeNode XMLTree::TaggedFoll(treeNode x, TagType tag)
        exit(1);
     }
 
-    int r, s;
+    //int r, s;
     if (x ==NULLT || x == Root())
        return NULLT;
-                   
-    r = (int) Tags->rank(tag, find_close(Par, x));
-    s = (int) Tags->select(tag, r+1);  // select returns -1 in case that there is no r+1-th tag.
+     
+		int s = (int) Tags->select_next(tag,find_close(Par,x));
+    /*r = (int) Tags->rank(tag, find_close(Par, x));
+    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;
     else return tagpos2node(s);
  } 
@@ -767,13 +780,14 @@ treeNode XMLTree::TaggedFoll(treeNode x, TagType tag)
 treeNode XMLTree::TaggedFollBelow(treeNode x, TagType tag, treeNode root)
  {
 
-    int r, s;
+    //int r, s;
     int lim = node2tagpos(find_close(Par,root));
     if (x ==NULLT || x == Root())
        return NULLT;
                    
-    r = (int) Tags->rank(tag,find_close(Par,x));
-    s = (int) Tags->select(tag, r+1);  // select returns -1 in case that there is no r+1-th tag.
+		int s = (int) Tags->select_next(tag,find_close(Par,x));
+    /*r = (int) Tags->rank(tag,find_close(Par,x));
+    s = (int) Tags->select(tag, r+1);  // select returns -1 in case that there is no r+1-th tag.*/
     if (s==-1 || s >= lim) 
       return NULLT;
     else 
@@ -790,14 +804,15 @@ treeNode XMLTree::TaggedFollowingSibling(treeNode x, TagType tag)
        exit(1);
     }
 
-    int r, s;
+    //int r, s;
     treeNode ns = next_sibling(Par,x);
 
     if (x == NULLT || x == Root() || ns == -1)
       return NULLT;
 
-    r = (int) Tags->rank(tag, node2tagpos(ns)-1);
-    s = (int) Tags->select(tag, r+1);  // select returns -1 in case that there is no r+1-th tag.
+		int s = (int) Tags->select_next(tag,node2tagpos(ns)-1);
+    /*r = (int) Tags->rank(tag, node2tagpos(ns)-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;
     else return tagpos2node(s);
  }
@@ -1079,7 +1094,7 @@ int XMLTree::CloseDocument()
     // makes the text collection static
     if (!disable_tc)
     {
-        assert(Text = 0);
+        assert(Text == 0);
         assert(TextBuilder != 0);
         Text = TextBuilder->InitTextCollection();
         delete TextBuilder;