Refactoring faustine in beam.ml -> method output.

[Faustine.git] / interpretor / beam.ml

diff --git a/interpretor/beam.ml b/interpretor/beam.ml
index 33fb08e..0468e42 100644 (file)
--- 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 width = Array.length signals
 
       method sub : int -> int -> beam_type = 
        fun start ->
@@ -25,17 +24,47 @@ 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#width then new beam self#get
+
+           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#width) self#get)) in
+             new beam split_signals
+
+           else if (size < self#width) && (self#width 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 array) * (float array array) = 
+         fun (length_max : int) ->
+           
     end