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 ->
let s = Naive.stats () in
Run.(
Logger.msg `STATS
- "@[tree size: %d@\ntraversals: %d@\ncache2 hit ratio: %f@\ncache5 hit ratio: %f@]"
+ "@[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 ->
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;