X-Git-Url: https://svn.cri.ensmp.fr/git/Faustine.git/blobdiff_plain/871f0359e3948f2172b0582ae49222805b7806d4..14e4f8cd6102d273c520c2d2e0168a5221a7daeb:/interpretor/beam.ml

diff --git a/interpretor/beam.ml b/interpretor/beam.ml
index 33fb08e..cf5c003 100644
--- a/interpretor/beam.ml
+++ b/interpretor/beam.ml
@@ -7,17 +7,16 @@
 
 exception Beam_matching of string;;
 
+open Types;;
 open Signal;;
 
 class beam : signal_type array -> beam_type = 
-  fun (sa_init : signal_type array) ->
+  fun (signals_init : signal_type array) ->
     object (self)
-      val sa = sa_init
-      val l = Array.length sa
+      val signals = signals_init
 
-      method get = sa
-
-      method length = l
+      method get = signals
+      method length = Array.length signals
 
       method sub : int -> int -> beam_type = 
 	fun start ->
@@ -25,17 +24,46 @@ class beam : signal_type array -> beam_type =
 	    new beam (Array.sub self#get start len)
 
       method append : beam_type -> beam_type =
-	fun b -> 
-	  new beam (Array.append self#get b)
+	fun (b : beam_type) -> 
+	  new beam (Array.append self#get b#get)
+
+      method private add_memory : int -> unit =
+	fun (window : int) ->
+	  let signal_add_memory : int -> signal_type -> unit = 
+	    fun (l : int) ->
+	      fun (s : signal) ->
+		s#add_memory l in
+	  let _ = Array.map (signal_add_memory window) self#get in ()
 	  
-      method matching : int -> beam_type
+      method matching : int -> beam_type = 
 	  fun size ->
-	    if size = self#length then self
-	    else if size > self#length && size mod self#length = 0 then
-	      
-	    else if size < self#length && self#length mod size = 0 then
-	      
+	    if size = self#length then new beam self#get
+
+	    else if (size > self#length) && (size mod self#length = 0) then
+	      let () = self#add_memory 1 in
+	      let split_signals = 
+		Array.concat (Array.to_list 
+		     (Array.make (size/self#length) self#get)) in
+	      new beam split_signals
+
+	    else if (size < self#length) && (self#length mod size = 0) then
+	      let rec merge_rec  = 
+		fun (sa : signal_type array) ->
+		  fun (l : int) ->
+		    fun (i : int) ->
+		      if i + l < Array.length sa then
+			(sa.(i))#add (merge_rec sa l (i + l))
+		      else sa.(i) in
+	      let merge_signals = Array.init size (merge_rec self#get size) in	
+	      new beam merge_signals
+
 	    else raise (Beam_matching "matching size error")
 
+      method time : 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) = 
+	  
     end