Pretty printing of main.ml.

diff --git a/interpretor/faustine b/interpretor/faustine
index 585ed24865e7fc75cccf4cea79abf2ee5cb80145..2de8a557c442d54ab07a347c506a2e3aaf9fddef 100755 (executable)
Binary files a/interpretor/faustine and b/interpretor/faustine differ

diff --git a/interpretor/gmon.out b/interpretor/gmon.out
index 8c27fb9625f37d9e8484b501308cfc9f30c9d84a..fd15f7fa70e6c50c88ae3c7e024f9179026996eb 100644 (file)
Binary files a/interpretor/gmon.out and b/interpretor/gmon.out differ

diff --git a/interpretor/main.ml b/interpretor/main.ml
index e214802d12142faa4a187f83b6e4c3c482d06b8a..ee778987ce28143054208d5271cb005273d2fcfe 100644 (file)
--- a/interpretor/main.ml
+++ b/interpretor/main.ml
@@ -62,11 +62,17 @@ let main () =
        let _ = set_GC () in
        let () = Arg.parse speclist option_unknown option_usage in
 
        let _ = set_GC () in
        let () = Arg.parse speclist option_unknown option_usage in
 

+
+       let () = print_string("    Faustine -> Reading input files...") in
+       let tic0 = Sys.time () in

        let wave = new waveio in
        let csv = new csvio in
        let input_wave = wave#read (Array.of_list !inwavs) in
        let input_csv = csv#read (Array.of_list !incsvs) in
        let input = input_wave#append input_csv in
        let wave = new waveio in
        let csv = new csvio in
        let input_wave = wave#read (Array.of_list !inwavs) in
        let input_csv = csv#read (Array.of_list !incsvs) in
        let input = input_wave#append input_csv in

+       let toc0 = Sys.time () in
+       let () = print_endline(" Done. (duration: " ^ (string_of_float (toc0 -. tic0)) ^ "s.)") in
+

 
        let () = print_string("    Faustine -> Preprocessing...") in
        let tic1 = Sys.time () in
 
        let () = print_string("    Faustine -> Preprocessing...") in
        let tic1 = Sys.time () in


@@ -75,7 +81,7 @@ let main () =
        let () = print_endline(" Done. (duration: " ^ (string_of_float (toc1 -. tic1)) ^ "s.)") in
 
 
        let () = print_endline(" Done. (duration: " ^ (string_of_float (toc1 -. tic1)) ^ "s.)") in
 
 

-       let () = print_string("    Faustine -> Interpretation...") in
+       let () = print_string("    Faustine -> Constructing process...") in

        let tic2 = Sys.time () in
        let faust_exp = exp_of_string faust_core in
        let proc = (new proc_factory)#make faust_exp in
        let tic2 = Sys.time () in
        let faust_exp = exp_of_string faust_core in
        let proc = (new proc_factory)#make faust_exp in


@@ -83,7 +89,14 @@ let main () =
        let () = print_endline(" Done. (duration: " ^ (string_of_float (toc2 -. tic2)) ^ "s.)") in
 
 
        let () = print_endline(" Done. (duration: " ^ (string_of_float (toc2 -. tic2)) ^ "s.)") in
 
 

+       let () = print_string("    Faustine -> Evaluation...") in
+       let tic3 = Sys.time () in

        let output = proc#eval input in
        let output = proc#eval input in

+       let toc3 = Sys.time () in
+       let () = print_endline(" Done. (duration: " ^ (string_of_float (toc3 -. tic3)) ^ "s.)") in
+
+
+

        let data = output#output time_maximum in
        let rates = output#frequency in
 
        let data = output#output time_maximum in
        let rates = output#frequency in