Examples' Makefiles are completed and tested.

[Faustine.git] / interpretor / beam.ml

diff --git a/interpretor/beam.ml b/interpretor/beam.ml
index 0468e42..bec7ed0 100644 (file)
--- a/interpretor/beam.ml
+++ b/interpretor/beam.ml
@@ -8,6 +8,8 @@
 exception Beam_matching of string;;
 
 open Types;;
 exception Beam_matching of string;;
 
 open Types;;

+open Basic;;
+open Value;;

 open Signal;;
 
 class beam : signal_type array -> beam_type = 
 open Signal;;
 
 class beam : signal_type array -> beam_type = 


@@ -23,6 +25,10 @@ class beam : signal_type array -> beam_type =
          fun len ->
            new beam (Array.sub self#get start len)
 
          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)
       method append : beam_type -> beam_type =
        fun (b : beam_type) -> 
          new beam (Array.append self#get b#get)


@@ -59,12 +65,44 @@ class beam : signal_type array -> beam_type =
 
            else raise (Beam_matching "matching size error")
 
 
            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
 
        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) = 
+      method output : int -> data = 

          fun (length_max : int) ->
          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 : rate_type array = 
+       let each_rate : signal -> rate = 
+         fun (s : signal) -> 
+           let rate = s#frequency in
+           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 
+

     end
     end