let main v query output =
- let _ = Tag.init (Tree.Binary.tag_pool v) in
+ let _ = Tag.init (Tree.tag_pool v) in
Printf.eprintf "Parsing query : ";
let query = try
time
let _ = Printf.eprintf "%!" in
let _ = match contains with
None -> ()
- | Some s -> Tree.Binary.init_contains v s
+ | Some s ->
+ let r = Tree.count v s
+ in
+ Printf.eprintf "Global count is %i, using " r;
+ if r < 60000 then begin
+ Printf.eprintf "TextCollection contains\nCalling global contains : ";
+ time (Tree.init_contains v) s
+ end
+ else begin
+ Printf.eprintf "Naive contains\nCalling global contains : ";
+ time (Tree.init_naive_contains v) s
+ end
in
Printf.eprintf "Execution time %s : " (if !Options.count_only then "(counting only)" else "");
begin
if !Options.count_only then
- failwith "Count only not implemented in this version"
+ let r = time ( run_count auto )v in
+ let _ = Printf.eprintf "Number of nodes in the result set : %i\n%!" r
+ in ()
else
- let _ = Gc.set ({ Gc.get() with Gc.max_overhead = 1000000; Gc.space_overhead = 100 }) in
- let result = time (if !Options.time then run_time auto else run auto) v in
- Printf.eprintf "Number of nodes in the result set : %i\n" (TS.length result);
+(* let _ = Gc.set ({ Gc.get() with Gc.max_overhead = 1000000; Gc.space_overhead = 100 }) in *)
+ let result,rcount = time (if !Options.time then run_time auto else run auto) v in
+ Printf.eprintf "Number of nodes in the result set : %i\n" rcount;
Printf.eprintf "\n%!";
begin
match output with
time( fun () ->
let oc = open_out f in
output_string oc "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
- TS.rev_iter (fun t -> output_string oc "----------\n";
- Tree.Binary.print_xml_fast oc t;
+ TS.iter (fun t -> output_string oc "----------\n";
+ Tree.print_xml_fast oc t;
output_char oc '\n') result) ();
end;
end;
+ let _ = Ata.dump Format.err_formatter auto in
Printf.eprintf "Total running time : %fms\n%!" (total_time())
;;
then
begin
Printf.eprintf "Loading from file : ";
- time (Tree.Binary.load ~sample:!Options.sample_factor )
+ time (Tree.load ~sample:!Options.sample_factor )
(Filename.chop_suffix !Options.input_file ".srx");
end
else
let v =
- time (fun () -> let v = Tree.Binary.parse_xml_uri !Options.input_file;
+ time (fun () -> let v = Tree.parse_xml_uri !Options.input_file;
in Printf.eprintf "Parsing document : %!";v
) ()
in
if !Options.save_file <> ""
then begin
Printf.eprintf "Writing file to disk : ";
- time (Tree.Binary.save v) !Options.save_file;
+ time (Tree.save v) !Options.save_file;
end;
v
in