X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=XMLTree.cpp;h=249143cfbe456ffc8d78d10262f82167baa773dd;hb=63a9066c6cdd10751ba5e9142fc3341f50392688;hp=34c72fd17d113f7460771d09e778d69aa27b9ab5;hpb=6b44f9761a8ca298295caf8504fcb54d59fde018;p=SXSI%2FXMLTree.git diff --git a/XMLTree.cpp b/XMLTree.cpp index 34c72fd..249143c 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;itags_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) {