return dest;\r
}\r
\r
+void XMLTree::print_stats() {\r
+ uint total_space = Tags->size()+sizeof(static_sequence*);\r
+ total_space += sizeof(uint*)+sizeof(uint)*(2+uint_len(tags_blen,tags_len));\r
+ cout << "Space usage for XMLTree:" << endl\r
+ << " - tags static_sequence: " << Tags->size()+sizeof(static_sequence*) << endl\r
+ << " - tags access array: " << sizeof(uint*)+sizeof(uint)*(2+uint_len(tags_blen,tags_len)) << endl\r
+ << " ... add Diego structures ... " << endl\r
+ << " *total* " << total_space << endl;\r
+}\r
+\r
// Save: saves XML tree data structure to file. \r
void XMLTree::Save(unsigned char *filename) \r
{\r
\r
// stores the tags\r
Tags->save(fp);\r
+ ufwrite(&tags_blen,sizeof(uint),1,fp);\r
+ ufwrite(&tags_len,sizeof(uint),1,fp);\r
+ ufwrite(tags_fix,sizeof(uint),uint_len(tags_blen,tags_len),fp);\r
\r
// stores the texts \r
- if (!disable_tc)\r
+ if (!disable_tc) {\r
Text->Save(fp);\r
- if (!disable_tc){\r
- int st = CachedText.size();\r
- ufwrite(&st, sizeof(int),1,fp);\r
- for (int i = 0; i< CachedText.size(); ++i){\r
- st = CachedText.at(i).size();\r
+ int st = CachedText.size();\r
ufwrite(&st, sizeof(int),1,fp);\r
- ufwrite(CachedText.at(i).c_str(),sizeof(char),(1+strlen(CachedText.at(i).c_str())),fp);\r
- };\r
+ for (int i = 0; i< CachedText.size(); i++){\r
+ st = CachedText.at(i).size();\r
+ ufwrite(&st, sizeof(int),1,fp);\r
+ ufwrite(CachedText.at(i).c_str(),sizeof(char),1+CachedText.at(i).size(),fp);\r
+ };\r
};\r
fclose(fp);\r
\r
\r
// loads the tags\r
XML_Tree->Tags = static_sequence::load(fp);\r
+ ufread(&XML_Tree->tags_blen,sizeof(uint),1,fp);\r
+ ufread(&XML_Tree->tags_len,sizeof(uint),1,fp);\r
+ XML_Tree->tags_fix = new uint[uint_len(XML_Tree->tags_blen,XML_Tree->tags_len)];\r
+ ufread(XML_Tree->tags_fix,sizeof(uint),uint_len(XML_Tree->tags_blen,XML_Tree->tags_len),fp);\r
+ s_tree+=2*sizeof(uint)+sizeof(uint)*uint_len(XML_Tree->tags_blen,XML_Tree->tags_len);\r
s_tree+= XML_Tree->Tags->size();\r
\r
s_text = ftell(fp);\r
};\r
\r
}\r
- else\r
+ else {\r
XML_Tree->Text = NULL;\r
-\r
+ }\r
s_text = ftell(fp) - s_text;\r
\r
\r
\r
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
+ /*std::cerr << "Tree part is " << s_tree/1024 << " Kbytes,\n"\r
+ << "with node->tagid part " << XML_Tree->Tags->size()/1024+(uint_len(XML_Tree->tags_blen,XML_Tree->tags_len)*sizeof(uint))/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
+ << "Text collection is " << s_text/1024 << " Kbytes \n";*/\r
+ XML_Tree->print_stats();\r
return XML_Tree;\r
}\r
\r
exit(1);\r
}\r
\r
- return Tags->access(node2tagpos(x));\r
+ return get_field(tags_fix,tags_blen,node2tagpos(x)); //Tags->access(node2tagpos(x));\r
}\r
\r
// DocIds(x): returns the range of text identifiers that descend from node x.\r
}\r
\r
range r;\r
+ if (x == NULLT)\r
+ {\r
+ r.min = NULLT;\r
+ r.max = NULLT;\r
+ return r;\r
+ };\r
+ \r
+ \r
if (indexing_empty_texts) { // faster, no rank needed\r
r.min = x;\r
r.max = x+2*subtree_size(Par, x)-2;\r
fprintf(stderr, "Error: data structure has not been constructed properly\n");\r
exit(1);\r
}\r
- if (x == Root())\r
+ if (x == Root() || x==NULLT)\r
return NULLT;\r
- \r
+ \r
return next_sibling(Par, x);\r
}\r
\r
child = first_child(Par, x); // starts at first child of node x\r
if (child==(treeNode)-1) return NULLT; // node x is a leaf, there is no such child\r
while (child!=(treeNode)-1) {\r
- if (Tags->access(node2tagpos(child)) == tag) { // current child is labeled with tag of interest\r
+ if (get_field(tags_fix,tags_blen,node2tagpos(child)) /*Tags->access(node2tagpos(child))*/ == tag) { // current child is labeled with tag of interest\r
i--;\r
if (i==0) return child; // we have seen i children of x tagged tag, this is the one we are looking for\r
}\r
else return y;\r
}\r
\r
+treeNode XMLTree::TaggedDescOnly(treeNode x,TagType *desctags, unsigned int dtlen)\r
+{\r
+\r
+ treeNode res,y;\r
+ if (isleaf(Par,x))\r
+ return NULLT;\r
+ \r
+ res=NULLT;\r
+ for (unsigned int i = 0; i < dtlen; i ++ )\r
+ {\r
+ y = TaggedDesc(x,desctags[i]);\r
+ res = (res == NULLT) || (( res != NULLT) && (y =! NULLT) && y < res) ? y : res;\r
+ \r
+ };\r
+ \r
+ return res;\r
+ \r
+}\r
+\r
+\r
+treeNode XMLTree::TaggedBelow(treeNode x, TagType *childtags, unsigned int ctlen,\r
+ TagType *desctags, unsigned int dtlen)\r
+{\r
+ treeNode fs,y,res;\r
+ TagType tag;\r
+\r
+ if (isleaf(Par,x))\r
+ return NULLT;\r
+ \r
+ res = NULLT;\r
+ fs = first_child(Par,x);\r
+ while (fs != NULLT) {\r
+ tag = get_field(tags_fix,tags_blen,node2tagpos(fs));\r
+ \r
+ /* Check for first_child */\r
+ for (unsigned int i = 0; i < ctlen; i++) {\r
+ if (childtags[i] == tag)\r
+ return fs;\r
+ };\r
+ \r
+ for (unsigned int i = 0; i < dtlen; i++)\r
+ if (desctags[i] == tag)\r
+ return fs; \r
+ \r
+ /* check in the descendants */\r
+ res = NULLT;\r
+ for (unsigned int i = 0; i < dtlen; i ++ ){\r
+ /* maybe inline by hand */\r
+ y = TaggedDesc(fs,desctags[i]);\r
+ res = (res==NULLT || (y != NULLT) &&(y < res)) ? y : res; \r
+ };\r
+ if (res != NULLT)\r
+ return res;\r
+ \r
+ fs = next_sibling(Par,fs);\r
+ };\r
+ return res;\r
+ \r
+}\r
+treeNode XMLTree::TaggedFollOnly(treeNode x,TagType *folltags, unsigned int ftlen,treeNode root)\r
+{\r
+\r
+ treeNode res,y,lim;\r
+ lim = find_close(Par,root); \r
+ res=NULLT;\r
+ for (unsigned int i = 0; i < ftlen; i ++ )\r
+ {\r
+ y = TaggedFoll(x,folltags[i]);\r
+ res = (res == NULLT) || (( res != NULLT) && (y =! NULLT) && y < res) ? y : res;\r
+ \r
+ };\r
+ \r
+ return res < lim ? res : NULLT;\r
+ \r
+}\r
+\r
+treeNode XMLTree::TaggedDescOrFollOnly(treeNode x,TagType *folltags, unsigned int ftlen,treeNode root)\r
+{\r
+\r
+ treeNode res,y,lim;\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
+ if (s == -1) \r
+ y = NULLT; // there is no such node\r
+ else {\r
+ y = tagpos2node(s); \r
+ if (y >= lim)\r
+ y = NULLT;\r
+ };\r
+ res = (res == NULLT) || (( res != NULLT) && (y =! NULLT) && y < res) ? y : res;\r
+ \r
+ };\r
+ \r
+ return res < lim ? res : NULLT;\r
+ \r
+}\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
+treeNode XMLTree::TaggedNext(treeNode x, TagType *childtags, unsigned int ctlen,\r
+ TagType *folltags, unsigned int flen,treeNode root)\r
{\r
- if (!finished) {\r
- fprintf(stderr, "Error: data structure has not been constructed properly\n");\r
- exit(1);\r
- }\r
+ treeNode y,old_y,lim,res;\r
+ TagType tag;\r
+ if (x == NULLT || x == Root())\r
+ return NULLT;\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
+ lim = find_close(Par,root); \r
+\r
+ res = NULLT;\r
+ \r
+ y = next_sibling(Par,x);\r
+ while (y != NULLT) {\r
+ tag = get_field(tags_fix,tags_blen,node2tagpos(y));\r
+ for(unsigned int i = 0; i < ctlen;i++)\r
+ if (childtags[i] == tag)\r
+ return y;\r
+ \r
+ for(unsigned int i = 0; i < flen;i++)\r
+ if (folltags[i] == tag)\r
+ return y;\r
+\r
+ res = TaggedBelow(y,NULL,0,folltags,flen);\r
+ if (res != NULLT)\r
+ return res;\r
+ \r
+ y = next_sibling(Par,y);\r
+ };\r
+ //Found nothing in the following sibling of x.\r
+ res = NULLT;\r
+ for(unsigned int i = 0; i < flen;i++){\r
+ y = TaggedFoll(x,folltags[i]);\r
+ res = (y!= x && (res == NULLT || (y != NULLT && y < res)))? y : res;\r
+ };\r
+ \r
+ return res < lim ? res : NULLT;\r
+ \r
}\r
\r
\r
\r
treeNode s = parent(Par, x), r = Root();\r
while (s != r) {\r
- if (Tags->access(node2tagpos(s)) == tag) return s;\r
+ if (get_field(tags_fix,tags_blen,node2tagpos(s)) /*Tags->access(node2tagpos(s))*/ == tag) return s;\r
s = parent(Par, s);\r
}\r
return NULLT;\r
return (treeNode)s;\r
\r
}\r
+treeNode XMLTree::PrevNode(DocID d) \r
+ {\r
+ if (!finished) {\r
+ fprintf(stderr, "Error: data structure has not been constructed properly\n");\r
+ exit(1);\r
+ }\r
+ \r
+ if (d == NULLT)\r
+ return NULLT;\r
+ \r
+ int s;\r
+ \r
+ if (indexing_empty_texts) s = d;\r
+ else s = EBVector->select1(d+1);\r
+ if (s == -1)\r
+ return NULLT;\r
+ \r
+ if (inspect(Par,s) == CP) // is a closing parenthesis\r
+ return find_open(Par, s);\r
+ else // is an opening parenthesis\r
+ return NULLT;\r
+ \r
+ }\r
\r
\r
// OpenDocument(empty_texts): it starts the construction of the data structure for\r
found_attributes = false;\r
npar = 0;\r
parArraySize = 1;\r
- ntagnames = 2; \r
+ ntagnames = 4; \r
disable_tc = dtc;\r
\r
indexing_empty_texts = empty_texts;\r
\r
tags_aux = (TagType *) umalloc(sizeof(TagType));\r
\r
- TagName = (unsigned char **) umalloc(2*sizeof(unsigned char*));\r
+ TagName = (unsigned char **) umalloc(4*sizeof(unsigned char*));\r
\r
TagName[0] = (unsigned char *) umalloc(4*sizeof(unsigned char));\r
\r
TagName[1] = (unsigned char *) umalloc(4*sizeof(unsigned char));\r
\r
strcpy((char *) TagName[1], "<$>");\r
+ \r
+ //OJO need to put these in the table too.\r
+ TagName[2] = (unsigned char *) umalloc(5*sizeof(unsigned char));\r
+\r
+ strcpy((char *) TagName[2], "/<@>");\r
+\r
+ TagName[3] = (unsigned char *) umalloc(5*sizeof(unsigned char));\r
+\r
+ strcpy((char *) TagName[3], "/<$>");\r
\r
\r
if (!indexing_empty_texts) \r
Par = (bp *)umalloc(sizeof(bp));\r
bp_construct(Par, npar, par_aux, OPT_DEGREE|0); \r
// creates structure for tags\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_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
\r
\r
// If we found an attribute then "<@>" is present in the tree\r
// if we didn't then it is not. "<$>" is never present in the tree\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
int ntagsize = found_attributes ? 2*ntagnames-1 : 2*ntagnames - 2;\r
-\r
- Tags = new static_sequence_gmr((uint *) tags_aux, (uint) npar-1,ntagsize, bmb, ssb);\r
+ tags_aux = (TagType *) urealloc(tags_aux, sizeof(TagType)*(npar + 1));\r
+ tags_aux[npar++] = max_tag;\r
+\r
+ static_bitsequence_builder * bmb = new static_bitsequence_builder_brw32(20);\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
+ //Tags = new static_sequence_gmr((uint *) tags_aux, (uint) npar-1,ntagsize, bmb, ssb);\r
+ tags_blen = bits(max_tag);\r
+ tags_len = (uint)npar;\r
+ tags_fix = new uint[uint_len(tags_blen,tags_len)];\r
+ for(uint i=0;i<(uint)npar-1;i++)\r
+ set_field(tags_fix,tags_blen,i,tags_aux[i]);\r
\r
delete bmb;\r
- delete pmb;\r
- delete ssb;\r
+ //delete pmb;\r
+ //delete ssb;\r
// makes the text collection static\r
if (!disable_tc)\r
Text->MakeStatic();\r
tags_aux = NULL;\r
\r
finished = true;\r
+ print_stats();\r
\r
return 1; // indicates success in the inicialization\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 (TagType)NULLT; // tagname does not exists in the table\r
+ if (i==ntagnames) return ntagnames; //(TagType)NULLT; // tagname does not exists in the table\r
else return i;\r
}\r
\r