X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=OCamlDriver.cpp;h=78d3e15de8ceb4e53bcc9069a394f44ac16fd570;hb=25dd7fcc77c2188732d96d5ff98d759bb81737cb;hp=f56b4a3bea17ed424b55e6ed2746a6f222686aeb;hpb=dc91851aaeac91a71eba2c266d0227adea0c5815;p=SXSI%2Fxpathcomp.git diff --git a/OCamlDriver.cpp b/OCamlDriver.cpp index f56b4a3..78d3e15 100644 --- a/OCamlDriver.cpp +++ b/OCamlDriver.cpp @@ -16,9 +16,28 @@ extern "C" { #include #include #include + + +#include +#include +#include +#include + + struct tms t1; + struct tms t2; + double ticks = (double) sysconf(_SC_CLK_TCK)/1000; + void start_clock() { + times (&t1); + } + + + double stop_clock() { + times (&t2); + return (t2.tms_utime-t1.tms_utime)/ticks; + } +} //extern C -} //extern C //#include "TextCollection/TextCollection.h" #include "XMLDocShredder.h" @@ -95,6 +114,9 @@ extern "C" CAMLprim value caml_call_shredder_string(value data,value sf, value i }; } + + + void traversal_rec(XMLTree* tree, treeNode id){ DocID tid; if (id == NULLT) @@ -143,14 +165,6 @@ extern "C" CAMLprim value caml_text_collection_get_cached_text(value tree, value CAMLreturn (str); } -extern "C" CAMLprim value caml_text_collection_size(value tree){ - CAMLparam1(tree); - // CAMLreturn (Val_int( XMLTREE(tree)->CachedText.size())); - NOT_IMPLEMENTED("text_collection_size"); - CAMLreturn (Val_unit); -} - - extern "C" CAMLprim value caml_text_collection_empty_text(value tree,value id){ CAMLparam2(tree,id); @@ -171,8 +185,8 @@ extern "C" CAMLprim value caml_text_collection_count_contains(value tree,value s } extern "C" CAMLprim value caml_text_collection_count(value tree,value str){ CAMLparam2(tree,str); - //uchar * cstr = (uchar *) String_val(str); - NOT_IMPLEMENTED("text_collection_count"); + uchar * cstr = (uchar *) String_val(str); + CAMLreturn (Val_int((XMLTREE(tree)->Count(cstr)))); CAMLreturn (Val_unit); } @@ -191,6 +205,16 @@ extern "C" CAMLprim value caml_text_collection_contains(value tree,value str){ }; CAMLreturn (resarray); } +extern "C" CAMLprim value caml_text_collection_unsorted_contains(value tree,value str){ + CAMLparam2(tree,str); + uchar * cstr = (uchar *) String_val(str); + std::vector results; + start_clock(); + results = XMLTREE(tree)->Contains(cstr); + double d = stop_clock(); + std::cerr << "Internal timing " << d <<" ms\n"; + CAMLreturn (Val_unit); +} extern "C" CAMLprim value caml_xml_tree_root(value tree){ @@ -237,6 +261,15 @@ extern "C" CAMLprim value caml_xml_tree_unserialize(value filename){ CAMLreturn(Val_unit); } +extern "C" CAMLprim value caml_xml_tree_last_child(value tree, value id){ + CAMLparam2(tree,id); + CAMLreturn(Val_int (XMLTREE(tree)->LastChild(TREENODEVAL(id)))); +} + +extern "C" CAMLprim value caml_xml_tree_is_first_child(value tree, value id){ + CAMLparam2(tree,id); + CAMLreturn(Val_bool (XMLTREE(tree)->IsFirstChild(TREENODEVAL(id)))); +} extern "C" CAMLprim value caml_xml_tree_first_child(value tree, value id){ CAMLparam2(tree,id); @@ -258,6 +291,10 @@ extern "C" CAMLprim value caml_xml_tree_tagged_foll(value tree, value id, value CAMLparam3(tree,id,tag); CAMLreturn(Val_int (XMLTREE(tree)->TaggedFoll(TREENODEVAL(id),(TagType) Int_val(tag)))); } +extern "C" CAMLprim value caml_xml_tree_tagged_foll_below(value tree, value id, value tag,value root){ + CAMLparam4(tree,id,tag,root); + CAMLreturn(Val_int (XMLTREE(tree)->TaggedFollBelow(TREENODEVAL(id),(TagType) Int_val(tag),TREENODEVAL(root)))); +} extern "C" CAMLprim value caml_xml_tree_next_sibling(value tree, value id){ @@ -267,9 +304,7 @@ extern "C" CAMLprim value caml_xml_tree_next_sibling(value tree, value id){ extern "C" CAMLprim value caml_xml_tree_prev_text(value tree, value id){ CAMLparam2(tree,id); - CAMLlocal1(res); CAMLreturn(Val_int((XMLTREE(tree)->PrevText(TREENODEVAL(id))))); - CAMLreturn(res); } extern "C" CAMLprim value caml_xml_tree_next_text(value tree, value id){ CAMLparam2(tree,id); @@ -370,7 +405,7 @@ extern "C" CAMLprim value caml_int_vector_set(value vec, value i, value v){ #define VECT(x) ((int*) (x)) -extern "C" CAMLprim value caml_xml_tree_tagged_below(value tree, value node, value ctags, value dtags){ +extern "C" CAMLprim value caml_xml_tree_select_below(value tree, value node, value ctags, value dtags){ CAMLparam4(tree,node,ctags,dtags); CAMLreturn (Val_int ( @@ -381,7 +416,7 @@ extern "C" CAMLprim value caml_xml_tree_tagged_below(value tree, value node, val VECT(dtags)[0])))); } -extern "C" CAMLprim value caml_xml_tree_tagged_next(value tree, value node, value ctags, value ftags,value root){ +extern "C" CAMLprim value caml_xml_tree_select_next(value tree, value node, value ctags, value ftags,value root){ CAMLparam5(tree,node,ctags,ftags,root); CAMLreturn (Val_int ( (XMLTREE(tree)->TaggedNext(TREENODEVAL(node), @@ -392,7 +427,7 @@ extern "C" CAMLprim value caml_xml_tree_tagged_next(value tree, value node, valu TREENODEVAL(root))))); } -extern "C" CAMLprim value caml_xml_tree_tagged_desc_only(value tree, value node,value dtags){ +extern "C" CAMLprim value caml_xml_tree_select_desc_only(value tree, value node,value dtags){ CAMLparam3(tree,node,dtags); CAMLreturn (Val_int ( @@ -401,7 +436,7 @@ extern "C" CAMLprim value caml_xml_tree_tagged_desc_only(value tree, value node, VECT(dtags)[0])))); } -extern "C" CAMLprim value caml_xml_tree_tagged_foll_only(value tree, value node, value ftags,value root){ +extern "C" CAMLprim value caml_xml_tree_select_foll_only(value tree, value node, value ftags,value root){ CAMLparam4(tree,node,ftags,root); CAMLreturn (Val_int ( (XMLTREE(tree)->TaggedFollOnly(TREENODEVAL(node), @@ -410,7 +445,7 @@ extern "C" CAMLprim value caml_xml_tree_tagged_foll_only(value tree, value node, TREENODEVAL(root))))); } -extern "C" CAMLprim value caml_xml_tree_tagged_desc_or_foll_only(value tree, value node, value ftags,value root){ +extern "C" CAMLprim value caml_xml_tree_select_desc_or_foll_only(value tree, value node, value ftags,value root){ CAMLparam4(tree,node,ftags,root); CAMLreturn (Val_int ( (XMLTREE(tree)->TaggedDescOrFollOnly(TREENODEVAL(node),