X-Git-Url: https://scm.cri.ensmp.fr/git/Faustine.git/blobdiff_plain/d1f93175cc683d72876cb56b4a8f566578296bb9..84216a960fd7a1334db3d5d519dfb72a0671a55a:/interpretor/beam.ml diff --git a/interpretor/beam.ml b/interpretor/beam.ml index f9ea667..b66ac2b 100644 --- a/interpretor/beam.ml +++ b/interpretor/beam.ml @@ -72,9 +72,6 @@ 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 @@ -91,26 +88,13 @@ class beam : signal_type array -> beam_type = container.(!index) <- Array.map value2float (self#at !index); incr index; done; - let result = transpose container in - let toc = Sys.time () in - let () = print_endline (" Done. (duration: " ^ (string_of_float (toc -. tic)) ^ "s.)") in - result + transpose container with x -> - let error_message = match x with - | Convert_Error s -> "Convert_Error: " ^ s - | Basic_operation s -> "Basic_operation: " ^ s - | Signal_operation s -> "Signal_operation: " ^ s - | Beam_matching s -> "Beam_Matching_Error: " ^ s - | Invalid_argument s -> "" - | _ -> "Unknown error" - in - 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 + | Invalid_argument s -> + transpose (Array.sub container 0 !index) + | _ -> raise x method frequency : int array = let each_rate : signal -> int =