X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=OCamlDriver.cpp;h=39190d6693eba1ba22175df906ca1448116b44bc;hb=1b4d4c7a0537d30e21068f06535c5d3a1af92f88;hp=3994970d2373dfecb3568c60584c0032169eb9cf;hpb=a6a05531716a001b369e018c9d2c87ce532ef163;p=SXSI%2Fxpathcomp.git

diff --git a/OCamlDriver.cpp b/OCamlDriver.cpp
index 3994970..39190d6 100644
--- a/OCamlDriver.cpp
+++ b/OCamlDriver.cpp
@@ -430,6 +430,10 @@ NoAlloc extern "C"  value caml_xml_tree_size(value tree){
   return (Val_int(XMLTREE(tree)->Size()));
 }
 
+NoAlloc extern "C"  value caml_xml_tree_num_tags(value tree){
+  return (Val_int(XMLTREE(tree)->NumTags()));
+}
+
 NoAlloc extern "C"  value caml_xml_tree_subtree_size(value tree, value node){
   return (Val_int(XMLTREE(tree)->SubtreeSize(TREENODEVAL(node))));
 }
@@ -774,8 +778,10 @@ int iterjump(XMLTree* tree, treeNode node, TagType tag, treeNode anc){
   if (node == NULLT)
     return 0;
   else {
-    return /*1+iterjump(tree,tree->TaggedDescendant(node,tag),tag,node)
-	     +*/ iterjump(tree,tree->TaggedFollowingBelow(node,tag,anc),tag,anc);
+    return 
+      1
+      + iterjump(tree,tree->TaggedDescendant(node,tag),tag,node)
+      + iterjump(tree,tree->TaggedFollowingBelow(node,tag,anc),tag,anc);
   };
 }
 
@@ -784,7 +790,7 @@ extern "C" value caml_benchmark_jump(value tree,value tag){
   treeNode root = XMLTREE(tree)->FirstChild(0);
   root = XMLTREE(tree)->FirstChild(root);
   count = iterjump(XMLTREE(tree), root , Int_val(tag),0);
-  return Val_unit;
+  return Val_int(count);
 }
 
 int iterfcns(XMLTree* tree, treeNode node){
@@ -792,8 +798,19 @@ int iterfcns(XMLTree* tree, treeNode node){
     return 0;
   else {
     int tmp = 1;
-    tmp += iterfcns(tree,tree->FirstElement(node));
-    tmp += iterfcns(tree,tree->NextElement(node));
+    tmp += iterfcns(tree,tree->FirstChild(node));
+    tmp += iterfcns(tree,tree->NextSibling(node));
+    return tmp;    
+  };
+}
+
+int iterfene(XMLTree* tree, treeNode node){
+  if (node == NULLT)
+    return 0;
+  else {
+    int tmp = 1;
+    tmp += iterfene(tree,tree->FirstElement(node));
+    tmp += iterfene(tree,tree->NextElement(node));
     return tmp;    
   };
 }
@@ -804,6 +821,12 @@ extern "C" value caml_benchmark_fcns(value tree){
 		    
 }
 
+extern "C" value caml_benchmark_fene(value tree){
+  int i = iterfene(XMLTREE(tree),0);
+  return Val_int(i);
+		    
+}
+
 int iterlcps(XMLTree* tree, treeNode node){
   if (node == NULLT)
     return 0;
@@ -815,6 +838,33 @@ int iterlcps(XMLTree* tree, treeNode node){
   };
 }
 
+int fulliterative(XMLTree* tree){
+  treeNode current = tree->Root();
+  treeNode next = NULLT;
+  int count = 1; //the root
+
+  do {
+  
+
+    while ((next = tree->FirstChild(current)) != NULLT) {
+      current = next;
+      count++;
+    };
+
+    while ( (next = tree->NextSibling(current)) == NULLT){
+      current = tree->Parent(current);
+      if (current == NULLT) return count;
+    }
+    current = next;
+    count++;
+  } while (true);
+
+}
+
+extern "C" value caml_benchmark_iter(value tree){
+  return Val_int(fulliterative(XMLTREE(tree)));
+}
+
 extern "C" value caml_benchmark_lcps(value tree){  
   iterlcps(XMLTREE(tree),0);
   return Val_unit;
@@ -847,14 +897,17 @@ extern "C" {
     return;
   }
 
-  dummy_node * create_tree(XMLTree* tree, treeNode i){
+  dummy_node * create_tree(XMLTree* tree, treeNode i, int mode){
     if (i == NULLT)
        return NULL;
     else {
       dummy_node * f, *n, *r;
-      f = create_tree(tree,tree->FirstChild(i));
-      n = create_tree(tree,tree->NextSibling(i));
-      r = new_dummy_node();
+      //mode = i % 3;
+      if (mode == 0) r = new_dummy_node();
+      f = create_tree(tree,tree->FirstChild(i), mode);
+      if (mode == 1) r = new_dummy_node();
+      n = create_tree(tree,tree->NextSibling(i), mode);
+      if (mode == 2) r = new_dummy_node();
       r->first = f;
       r->next = n;
       return r;
@@ -864,14 +917,12 @@ extern "C" {
   int iter_tree(dummy_node * n){
     if (n == NULL)
       return 0;
-    else {
-      return (1+ iter_tree(n->next)+ iter_tree(n->first) );
-    };
+    else
+      return 1 + iter_tree (n->first) + iter_tree (n->next);
   }
-
 }
-extern "C" value caml_build_pointers(value tree){
-  return ((value) create_tree(XMLTREE(Field(tree,0)),0));
+extern "C" value caml_build_pointers(value tree, value mode){
+  return ((value) create_tree(XMLTREE(Field(tree,0)),0, Int_val(mode)));
 }
 
 extern "C" value caml_iter_pointers (value node){