s_tree+= XML_Tree->Tags->size();\r
\r
/// FIXME:UGLY tests!\r
- /*uint * seq = new uint[XML_Tree->tags_len];\r
+ uint * seq = new uint[XML_Tree->tags_len];\r
for(uint i=0;i<XML_Tree->tags_len;i++)\r
seq[i] = get_field(XML_Tree->tags_fix,XML_Tree->tags_blen,i);\r
cout << "Tags test: " << XML_Tree->Tags->test(seq,XML_Tree->tags_len) << endl;\r
- delete [] seq;*/\r
+ delete [] seq;\r
/// End ugly tests\r
\r
s_text = ftell(fp);\r
\r
// loads the texts\r
if (!XML_Tree->disable_tc){\r
- XML_Tree->Text = TextCollection::InitTextCollection(sample_rate_text);\r
- XML_Tree->Text->Load(fp,sample_rate_text);\r
+ XML_Tree->Text = TextCollection::Load(fp,sample_rate_text);\r
int sst;\r
int st;\r
ufread(&sst, sizeof(int),1,fp);\r
Tags = NULL;\r
\r
//Text->~TextCollection();\r
- delete Text;\r
+ delete TextBuilder; \r
+ TextBuilder = NULL;\r
+ delete Text; \r
Text = NULL;\r
\r
initialized = false;\r
if (!is_ancestor(Par, x, y)) return false;\r
return depth(Par, x) == (depth(Par, y) + 1);\r
}\r
-\r
+bool XMLTree::IsFirstChild(treeNode x){\r
+ return ((x != NULLT)&&(x==Root() || prev_sibling(Par,x) == NULLT));\r
+}\r
// NumChildren(x): number of children of node x. Constant time with the data structure\r
// of Sadakane.\r
int XMLTree::NumChildren(treeNode x) \r
return first_child(Par, x);\r
}\r
\r
+treeNode XMLTree::LastChild(treeNode x) \r
+{\r
+ if (x == Root() || isleaf(Par,x) || x == NULLT)\r
+ return x;\r
+ else\r
+ return find_open(Par,find_close(Par,parent(Par,x))-1);\r
+}\r
+\r
// NextSibling(x): returns the next sibling of node x, assuming it exists.\r
treeNode XMLTree::NextSibling(treeNode x) \r
{\r
exit(1);\r
}\r
\r
- int r, s;\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
+ int s = (int) Tags->select_next(tag,node2tagpos(x));\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
if (!is_ancestor(Par, x, y)) return NULLT; // the next node tagged tag (in preorder) is not within the subtree of x.\r
{\r
\r
treeNode res,y,lim;\r
- int r,s;\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
+ int s = (int) Tags->select_next(folltags[i],node2tagpos(x));\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
exit(1);\r
}\r
\r
- int r, s;\r
+ //int r, s;\r
if (x ==NULLT || x == Root())\r
return NULLT;\r
- \r
- r = (int) Tags->rank(tag, find_close(Par, x));\r
- s = (int) Tags->select(tag, r+1); // select returns -1 in case that there is no r+1-th tag.\r
+ \r
+ int s = (int) Tags->select_next(tag,find_close(Par,x));\r
+ /*r = (int) Tags->rank(tag, find_close(Par, x));\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
else return tagpos2node(s);\r
} \r
treeNode XMLTree::TaggedFollBelow(treeNode x, TagType tag, treeNode root)\r
{\r
\r
- int r, s;\r
+ //int r, s;\r
int lim = node2tagpos(find_close(Par,root));\r
if (x ==NULLT || x == Root())\r
return NULLT;\r
\r
- r = (int) Tags->rank(tag,find_close(Par,x));\r
- s = (int) Tags->select(tag, r+1); // select returns -1 in case that there is no r+1-th tag.\r
+ int s = (int) Tags->select_next(tag,find_close(Par,x));\r
+ /*r = (int) Tags->rank(tag,find_close(Par,x));\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 || s >= lim) \r
return NULLT;\r
else \r
exit(1);\r
}\r
\r
- int r, s;\r
+ //int r, s;\r
treeNode ns = next_sibling(Par,x);\r
\r
if (x == NULLT || x == Root() || ns == -1)\r
return NULLT;\r
\r
- r = (int) Tags->rank(tag, node2tagpos(ns)-1);\r
- s = (int) Tags->select(tag, r+1); // select returns -1 in case that there is no r+1-th tag.\r
+ int s = (int) Tags->select_next(tag,node2tagpos(ns)-1);\r
+ /*r = (int) Tags->rank(tag, node2tagpos(ns)-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
else return tagpos2node(s);\r
}\r
if (!indexing_empty_texts) \r
empty_texts_aux = (unsigned int *)umalloc(sizeof(unsigned int));\r
\r
- \r
- \r
- Text = TextCollection::InitTextCollection((unsigned)sample_rate_text);\r
+ if (disable_tc)\r
+ TextBuilder = 0;\r
+ else \r
+ TextBuilder = new TextCollectionBuilder((unsigned)sample_rate_text);\r
+ Text = 0;\r
\r
return 1; // indicates success in the initialization of the data structure\r
}\r
uint max_tag = 0;\r
for(uint i=0;i<(uint)npar-1;i++)\r
max_tag = max(max_tag,tags_aux[i]);\r
- max_tag++;\r
- tags_aux = (TagType *) urealloc(tags_aux, sizeof(TagType)*(npar + 1));\r
- tags_aux[npar++] = max_tag;\r
+ //max_tag++;\r
+ //tags_aux = (TagType *) urealloc(tags_aux, sizeof(TagType)*(npar + 1));\r
+ //tags_aux[npar++] = max_tag;\r
//int ntagsize = found_attributes ? 2*ntagnames-1 : 2*ntagnames - 2;\r
int ntagsize = 2*ntagnames + 2;\r
\r
//static_bitsequence_builder * bmb = new static_bitsequence_builder_brw32(20);\r
//static_permutation_builder * pmb = new static_permutation_builder_mrrr(PERM_SAMPLE, bmb);\r
//static_sequence_builder * ssb = new static_sequence_builder_gmr_chunk(bmb, pmb);\r
- static_bitsequence_builder * bmb = new static_bitsequence_builder_brw32(20);\r
+ static_bitsequence_builder * bmb = new static_bitsequence_builder_sdarray();\r
alphabet_mapper *am = new alphabet_mapper_none();\r
- wt_coder * wc = new wt_coder_huff((uint*)tags_aux,npar,am);\r
- Tags = new static_sequence_wvtree((uint*)tags_aux,npar,wc ,bmb, am);\r
+ //wt_coder * wc = new wt_coder_huff((uint*)tags_aux,npar,am);\r
+ //Tags = new static_sequence_wvtree((uint*)tags_aux,npar,wc ,bmb, am);\r
//Tags = new static_sequence_gmr((uint *) tags_aux, (uint) npar,ntagsize, bmb, ssb);\r
+ Tags = new static_sequence_bs((uint*)tags_aux,npar,am,bmb);\r
\r
cout << "Tags test: " << Tags->test((uint*)tags_aux,npar) << endl;\r
\r
//delete ssb;\r
\r
\r
- // makes the text collection static\r
+ // makes the text collection static\r
if (!disable_tc)\r
- Text->MakeStatic();\r
- \r
+ {\r
+ assert(Text == 0);\r
+ assert(TextBuilder != 0);\r
+ Text = TextBuilder->InitTextCollection();\r
+ delete TextBuilder;\r
+ TextBuilder = 0;\r
+ }\r
+\r
// creates the data structure marking the non-empty texts (just in the case it is necessary)\r
if (!indexing_empty_texts) {\r
EBVector = new static_bitsequence_rrr02((uint *)empty_texts_aux,(ulong)npar,(uint)32);\r
bitset(empty_texts_aux, npar-1); // marks the non-empty text with a 1 in the bit vector\r
}\r
\r
- Text->InsertText(s);\r
+ TextBuilder->InsertText(s);\r
string cpps = (char*) s;\r
CachedText.push_back(cpps); \r
\r
\r
bitclean(empty_texts_aux, npar-1); // marks the empty text with a 0 in the bit vector\r
}\r
- else Text->InsertText(&c); // we insert the empty text just in case we index all the texts\r
+ else TextBuilder->InsertText(&c); // we insert the empty text just in case we index all the texts\r
\r
return 1; // success \r
}\r
// this should be changed for more efficient processing\r
for (i=0; i<ntagnames; i++)\r
if (strcmp((const char *)tagname,(const char *)TagName[i])==0) break; \r
- if (i==ntagnames) return ntagnames; //(TagType)NULLT; // tagname does not exists in the table\r
+ if (i==ntagnames) return (TagType)-1; //ntagnames; //(TagType)NULLT; // tagname does not exists in the table\r
else return i;\r
}\r
\r
unsigned char *XMLTree::GetTagName(TagType tagid)\r
{\r
unsigned char *s;\r
-\r
+ if(tagid==(uint)-1) return NULL;\r
if (tagid >= ntagnames) return NULL; // invalid tag identifier\r
s = (unsigned char *)umalloc((strlen((const char *)TagName[tagid])+1)*sizeof(unsigned char));\r
strcpy((char *)s, (const char *)TagName[tagid]);\r
\r
const unsigned char *XMLTree::GetTagNameByRef(TagType tagid)\r
{\r
+ if(tagid==(uint)-1) return NULL;\r
if (tagid >= ntagnames) return NULL; // invalid tag identifier\r
return ((const unsigned char*) TagName[tagid]);\r
}\r
projects / SXSI / XMLTree.git / blobdiff