Pretty printing of main.ml.

[Faustine.git] / interpretor / beam.ml

diff --git a/interpretor/beam.ml b/interpretor/beam.ml
index 273ae1c..f9ea667 100644 (file)
--- a/interpretor/beam.ml
+++ b/interpretor/beam.ml
@@ -72,6 +72,9 @@ class beam : signal_type array -> beam_type =
 
       method output : int -> float array array array = 
          fun (length_max : int) ->
 
       method output : int -> float array array array = 
          fun (length_max : int) ->

+           let () = print_string("    Faustine -> Calculating...") in
+           let tic = Sys.time () in
+

            let transpose : 'a array array -> 'a array array = 
              fun matrix ->
                let get_element = fun i -> fun array -> array.(i) in
            let transpose : 'a array array -> 'a array array = 
              fun matrix ->
                let get_element = fun i -> fun array -> array.(i) in


@@ -88,7 +91,10 @@ class beam : signal_type array -> beam_type =
                container.(!index) <- Array.map value2float (self#at !index);
                incr index;
              done;
                container.(!index) <- Array.map value2float (self#at !index);
                incr index;
              done;

-             transpose container
+             let result = transpose container in
+             let toc = Sys.time () in
+             let () = print_endline (" Done. (duration: " ^ (string_of_float (toc -. tic)) ^ "s.)") in
+             result

 
            with x ->
              let error_message = 
 
            with x ->
              let error_message = 


@@ -97,11 +103,14 @@ class beam : signal_type array -> beam_type =
                | Basic_operation s -> "Basic_operation: " ^ s
                | Signal_operation s -> "Signal_operation: " ^ s
                | Beam_matching s -> "Beam_Matching_Error: " ^ s
                | Basic_operation s -> "Basic_operation: " ^ s
                | Signal_operation s -> "Signal_operation: " ^ s
                | Beam_matching s -> "Beam_Matching_Error: " ^ s

-               | Invalid_argument s -> "Compute finished."
+               | Invalid_argument s -> ""

                | _ -> "Unknown error"
              in
                | _ -> "Unknown error"
              in

-             let () = print_string error_message in
-             transpose (Array.sub container 0 !index)
+             let () = print_string (error_message) in
+             let result = transpose (Array.sub container 0 !index) in
+             let toc = Sys.time () in
+             let () = print_endline (" Done. (duration: " ^ (string_of_float (toc -. tic)) ^ "s.)") in
+             result

 
       method frequency : int array = 
        let each_rate : signal -> int = 
 
       method frequency : int array = 
        let each_rate : signal -> int =