Merge branch 'OOP'

[Faustine.git] / interpretor / beam.ml

diff --git a/interpretor/beam.ml b/interpretor/beam.ml
index cf5c003..b66ac2b 100644 (file)
--- 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,13 +18,17 @@ 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 ->
          fun len ->
            new beam (Array.sub self#get start len)
 
+      method cut : int -> beam_type * beam_type =
+       fun (cut_width : int)->
+         ((self#sub 0 cut_width),(self#sub cut_width (self#width - cut_width))) 
+
       method append : beam_type -> beam_type =
        fun (b : beam_type) -> 
          new beam (Array.append self#get b#get)
@@ -37,16 +43,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 +65,44 @@ 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 -> float array 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 value2float = fun (v : value_type) -> v#to_float_array in
+            let init = [|0.|] in
+           let container = Array.make length_max 
+               (Array.make self#width init) in
+           let index = ref 0 in
+
+           try
+             while !index < length_max do
+               container.(!index) <- Array.map value2float (self#at !index);
+               incr index;
+             done;
+             transpose container
+
+           with x ->
+               match x with
+               | Invalid_argument s -> 
+                   transpose (Array.sub container 0 !index)
+               | _ -> raise x
+
+      method frequency : int array = 
+       let each_rate : signal -> int = 
+         fun (s : signal) -> 
+           let rate = s#frequency in
+           if rate > 0 then rate
+           else if rate = 0 then 44100
+           else raise (Beam_matching "frequency error.") in    
+       Array.map each_rate self#get 
+
     end