X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=utils.ml;h=b076733991c614ecf0244136a33b24880c89c1d1;hb=1b4d4c7a0537d30e21068f06535c5d3a1af92f88;hp=ce999327138f38ca963f02fbb78613a36b2c16ed;hpb=cfd834dcdee634387ad2354f1382eeb9d816be45;p=SXSI%2Fxpathcomp.git

diff --git a/utils.ml b/utils.ml
index ce99932..b076733 100644
--- a/utils.ml
+++ b/utils.ml
@@ -13,7 +13,7 @@ THEN
     DEFINE HPARAM = 65599
     DEFINE HPARAM2 = 4303228801
     DEFINE HPARAM3 = 282287506116799
-
+    DEFINE HPARAM4 = 71034040046345985
 ELSE
     DEFINE WORDSIZE = 32
     DEFINE HALFWORDSIZE = 16
@@ -23,13 +23,14 @@ ELSE
     DEFINE HPARAM = 65599
     DEFINE HPARAM2 = 8261505
     DEFINE HPARAM3 = 780587199
-
+    DEFINE HPARAM4 = 549173308
 END
 
 
 DEFINE HASHINT2 (x,y) = ((x)+HPARAM*(y))
 DEFINE HASHINT3 (x,y,z) = ((x)  + (y) * HPARAM + (z) * HPARAM2)
 DEFINE HASHINT4 (x,y,z,t) =  ((x)  + (y) * HPARAM + (z)*HPARAM2 + (t)* HPARAM3)
+DEFINE HASHINT5 (x,y,z,t,u) =  ((x)  + (y) * HPARAM + (z)*HPARAM2 + (t)* HPARAM3 + (u)*HPARAM4)
 
 DEFINE PRIME1 = 7
 DEFINE PRIME2 = 19
@@ -45,6 +46,9 @@ DEFINE SMALL_H_SIZE  = PRIME2
 DEFINE MED_H_SIZE    = PRIME5
 DEFINE BIG_H_SIZE    = PRIME8
 
+DEFINE SMALL_A_SIZE  = 128
+DEFINE MED_A_SIZE = 2048
+DEFINE BIG_A_SIZE = 8192
 
 
 let read_procmem () = 
@@ -69,7 +73,7 @@ let read_procmem () =
 
 let l = ref [] ;;
 let init_timer() = l := [];;
-let time f x =
+let time_mem f x =
   let s1  = read_procmem() in
   let t1 = Unix.gettimeofday () in
   let r = f x in
@@ -79,9 +83,20 @@ let time f x =
     l:= t::!l;
     Printf.eprintf "  %fms\n%!" t ;
     Printf.eprintf "Mem use before: %s\n%!" s1;
-    Printf.eprintf "Mem use after: %s\n\n\n%!" s2;
+    Printf.eprintf "Final Mem: %s\n\n\n%!" s2;
     r
 ;;
+let time f ?(count=1) ?(msg="") x =
+  let rec loop i = 
+  let t1 = Unix.gettimeofday () in
+  let r = f x in
+  let t2 = Unix.gettimeofday () in 
+  let t = (1000. *. (t2 -. t1)) in
+  Printf.eprintf "%s: run %i/%i,  %fms\n%!" msg i count t;
+  if i >= count then  (l:= t::!l;r)
+  else loop (i+1) 
+  in loop 1
+;;
 let total_time () =  List.fold_left (+.) 0. !l;;
 
 END (* IFNDEF UTILS__ML__ *)