X-Git-Url: https://scm.cri.mines-paristech.fr/git/Faustine.git/blobdiff_plain/f59ac471aa5a080301d70e7d7e1e81f34151ba2f..d1f93175cc683d72876cb56b4a8f566578296bb9:/interpretor/beam.ml

diff --git a/interpretor/beam.ml b/interpretor/beam.ml
index ffe8128..f9ea667 100644
--- 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) ->
+	    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
@@ -88,7 +91,10 @@ class beam : signal_type array -> beam_type =
 		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 = 
@@ -97,10 +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
-		| Invalid_argument s -> "Compute finished."
+		| Invalid_argument s -> ""
+		| _ -> "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 =