X-Git-Url: https://scm.cri.ensmp.fr/git/Faustine.git/blobdiff_plain/14e4f8cd6102d273c520c2d2e0168a5221a7daeb..4d5f39ea1ae1eff1d8eadf7875851be467e40a47:/interpretor/beam.ml?ds=inline

diff --git a/interpretor/beam.ml b/interpretor/beam.ml
index cf5c003..a4f22b8 100644
--- a/interpretor/beam.ml
+++ b/interpretor/beam.ml
@@ -8,6 +8,8 @@
 exception Beam_matching of string;;
 
 open Types;;
+open Basic;;
+open Value;;
 open Signal;;
 
 class beam : signal_type array -> beam_type = 
@@ -16,7 +18,7 @@ class beam : signal_type array -> beam_type =
       val signals = signals_init
 
       method get = signals
-      method length = Array.length signals
+      method width = Array.length signals
 
       method sub : int -> int -> beam_type = 
 	fun start ->
@@ -37,16 +39,16 @@ class beam : signal_type array -> beam_type =
 	  
       method matching : int -> beam_type = 
 	  fun size ->
-	    if size = self#length then new beam self#get
+	    if size = self#width then new beam self#get
 
-	    else if (size > self#length) && (size mod self#length = 0) then
+	    else if (size > self#width) && (size mod self#width = 0) then
 	      let () = self#add_memory 1 in
 	      let split_signals = 
 		Array.concat (Array.to_list 
-		     (Array.make (size/self#length) self#get)) in
+		     (Array.make (size/self#width) self#get)) in
 	      new beam split_signals
 
-	    else if (size < self#length) && (self#length mod size = 0) then
+	    else if (size < self#width) && (self#width mod size = 0) then
 	      let rec merge_rec  = 
 		fun (sa : signal_type array) ->
 		  fun (l : int) ->
@@ -59,11 +61,39 @@ class beam : signal_type array -> beam_type =
 
 	    else raise (Beam_matching "matching size error")
 
-      method time : time -> value_type array = 
+      method at : time -> value_type array = 
 	fun t ->
 	  let signal_at = fun (t : time) -> fun (s : signal_type) -> s#at t in
 	  Array.map (signal_at t) self#get
 
-      method output : int -> (int list) * (float array list) = 
-	  
+      method output : int -> value_type array array = 
+	  fun (length_max : int) ->
+	    let transpose : 'a array array -> 'a array array = 
+	      fun matrix ->
+		let get_element = fun i -> fun array -> array.(i) in
+		let get_column = fun m -> fun i -> Array.map (get_element i) m in
+		Array.init self#width (get_column matrix) in
+            let value_init = new value Error in
+	    let container = Array.make length_max 
+		(Array.make self#width value_init) in
+	    let index = ref 0 in
+
+	    try
+	      while !index < length_max do
+		container.(!index) <- self#at !index;
+		incr index;
+	      done;
+	      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
+		| _ -> "Compute finished."
+	      in
+	      let () = print_string error_message in
+	      transpose (Array.sub container 0 !index)
     end