.

[tatoo.git] / src / tatoo.ml

diff --git a/src/tatoo.ml b/src/tatoo.ml
index e0f29ee..90d8546 100644 (file)
--- a/src/tatoo.ml
+++ b/src/tatoo.ml
@@ -119,18 +119,22 @@ let main () =
       | false, false ->
           restart_sequential Naive.eval auto_list doc root, "sequential/restart"
     in
-    time f () ("evaluating query in " ^ msg ^ " mode")
+    time f () (Printf.sprintf "evaluating quer%s in %s mode"
+                              (match auto_list with
+                                 [] | [ _ ] -> "y" |  _ -> "ies" )
+                              msg)
   in
-  let s = Naive.stats () in
+  let sl = Naive.stats () in
   Run.(
+    List.iter (fun s -> 
   Logger.msg `STATS
-    "@[tree size: %d@\ntraversals: %d@\ntransition fetch cache hit ratio: %f@\ntransition eval cache hit ratio: %f@\nNumber of visited nodes per pass: %a@]"
-    s.tree_size s.pass
+    "@[automaton: %d@\ntree size: %d@\ntraversals: %d@\ntransition fetch cache hit ratio: %f@\ntransition eval cache hit ratio: %f@\nNumber of visited nodes per pass: %a@]"
+    (s.auto :> int) s.tree_size s.pass
     (float s.fetch_trans_cache_hit /. float s.fetch_trans_cache_access)
     (float s.eval_trans_cache_hit /. float s.eval_trans_cache_access)
     (let i = ref 0 in
      Pretty.print_list ~sep:"," (fun fmt n -> Format.fprintf fmt "%i: %i" !i n;incr i))
-    s.nodes_per_run);
+    s.nodes_per_run)) sl;
   time (fun () ->
     let count = ref 1 in
     List.iter (fun results ->