X-Git-Url: http://git.nguyen.vg/gitweb/?p=tatoo.git;a=blobdiff_plain;f=src%2Ftatoo.ml;h=24e212f6ba340e7f954112427758b62039ec240a;hp=ca162276f8a25e2cd72442c44761551cb72d6aeb;hb=3406b26f1ea26a997d7f194c547439891c108ce6;hpb=5b19281cbcdbd1ca5f565f6cd41dcfb7e18a297a

diff --git a/src/tatoo.ml b/src/tatoo.ml
index ca16227..24e212f 100644
--- a/src/tatoo.ml
+++ b/src/tatoo.ml
@@ -104,9 +104,10 @@ let main () =
       Logger.msg `STATS "@[Automaton: @\n%a@]" Ata.print auto) auto_list;
   end;
 
-  let module Naive = Run.Make(Naive_tree) in
+  let module Naive = Run.Make(Naive_tree)(Naive_node_list) in
   let result_list =
-    let root = [ Naive_tree.root doc] in
+
+    let root = Naive_node_list.(add (Naive_tree.root doc) (create())) in
     let f, msg =
       match !Options.parallel, !Options.compose with
         true, true ->
@@ -122,10 +123,11 @@ let main () =
   in
   let s = Naive.stats () in
   Run.(
-  Logger.msg `STATS "@[tree size: %d@\ntraversals: %d@\ncache2 hit ratio: %f@\ncache5 hit ratio: %f@]"
+  Logger.msg `STATS
+    "@[tree size: %d@\ntraversals: %d@\ntransition fetch cache hit ratio: %f@\ntransition eval cache hit ratio: %f@]"
     s.tree_size s.run
-    (float s.cache2_hit /. float s.cache2_access)
-    (float s.cache5_hit /. float s.cache5_access));
+    (float s.fetch_trans_cache_hit /. float s.fetch_trans_cache_access)
+    (float s.eval_trans_cache_hit /. float s.eval_trans_cache_access));
   time (fun () ->
     let count = ref 1 in
     List.iter (fun results ->
@@ -133,10 +135,10 @@ let main () =
       output_string output (string_of_int !count);
       output_string output "\" >\n";
       if !Options.count then begin
-        output_string output (string_of_int (List.length results));
+        output_string output (string_of_int (Naive_node_list.length results));
         output_char output '\n';
       end else
-        List.iter (fun n ->
+        Naive_node_list.iter (fun n ->
           Naive_tree.print_xml output doc n;
           output_char output '\n'
         ) results;