fixed typo in print_xml_fast

[SXSI/xpathcomp.git] / main.ml

diff --git a/main.ml b/main.ml
index ab043b7..aed4ebb 100644 (file)
--- a/main.ml
+++ b/main.ml
@@ -22,7 +22,7 @@ let total_time () =  List.fold_left (+.) 0. !l;;
 
 
 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
@@ -44,16 +44,16 @@ let main v query output =
        let _ = match contains with
            None -> ()
          | Some s -> 
-             let r = Tree.Binary.count v 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.Binary.init_contains v) s
+                 time (Tree.init_contains v) s
                end
                else begin
                  Printf.eprintf "Naive contains\nCalling global contains : ";
-                 time (Tree.Binary.init_naive_contains v) s
+                 time (Tree.init_naive_contains v) s
                end
        in
          Printf.eprintf "Execution time %s : " (if !Options.count_only then "(counting only)" else "");
@@ -63,9 +63,9 @@ let main v query output =
              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
@@ -75,11 +75,12 @@ let main v query output =
                      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 -> 
+                                          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())
 ;;
                
@@ -90,19 +91,19 @@ let v =
   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