X-Git-Url: https://scm.cri.mines-paristech.fr/git/Faustine.git/blobdiff_plain/d1f93175cc683d72876cb56b4a8f566578296bb9..8abe2ee3f9b99450a1097204076770fc1c29b75a:/interpretor/beam.ml?ds=inline

diff --git a/interpretor/beam.ml b/interpretor/beam.ml
index f9ea667..bec7ed0 100644
--- a/interpretor/beam.ml
+++ b/interpretor/beam.ml
@@ -70,11 +70,8 @@ class beam : signal_type array -> beam_type =
 	  let signal_at = fun (t : time) -> fun (s : signal_type) -> s#at t in
 	  Array.map (signal_at t) self#get
 
-      method output : int -> float array array array = 
+      method output : int -> data = 
 	  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,33 +88,20 @@ 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
-
-      method frequency : int array = 
-	let each_rate : signal -> int = 
+		| Invalid_argument s -> 
+		    transpose (Array.sub container 0 !index)
+		| _ -> raise x
+
+      method frequency : rate_type array = 
+	let each_rate : signal -> rate = 
 	  fun (s : signal) -> 
 	    let rate = s#frequency in
-	    if rate > 0 then rate
-	    else if rate = 0 then 44100
+	    if rate#num > 0 then rate
+	    else if rate#num = 0 then new rate 44100 1
 	    else raise (Beam_matching "frequency error.") in	
 	Array.map each_rate self#get