X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=src%2Ftatoo.ml;h=eac804a039a27f829e787e2b900543b80c59ff9e;hb=df5ce50d29b10bfdf26aff02c83d0a7ec614228a;hp=0987b6d905a9f5dcbce744c32fdd2820fded97f2;hpb=172af8a5311dd53ad6df9e330d6917200441dd39;p=tatoo.git diff --git a/src/tatoo.ml b/src/tatoo.ml index 0987b6d..eac804a 100644 --- a/src/tatoo.ml +++ b/src/tatoo.ml @@ -104,10 +104,10 @@ let main () = Logger.msg `STATS "@[Automaton: @\n%a@]" Ata.print auto) auto_list; end; - let module Naive = Run.Make(Naive_tree)(Naive_node_list) in + let module Naive = Run.Make(Naive_tree) in let result_list = - let root = Naive_node_list.create () in - let () = Naive_node_list.add (Naive_tree.root doc) root in + let root = Sequence.create () in + let () = Sequence.add (Naive_tree.root doc) root in let f, msg = match !Options.parallel, !Options.compose with true, true -> @@ -121,13 +121,6 @@ let main () = in time f () ("evaluating query in " ^ msg ^ " mode") in - let s = Naive.stats () in - Run.( - 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.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 -> @@ -135,10 +128,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 (Naive_node_list.length results)); + output_string output (string_of_int (Sequence.length results)); output_char output '\n'; end else - Naive_node_list.iter (fun n -> + Sequence.iter (fun n -> Naive_tree.print_xml output doc n; output_char output '\n' ) results;