Pretty printing of main.ml.

[Faustine.git] / interpretor / faustio.ml

diff --git a/interpretor/faustio.ml b/interpretor/faustio.ml
index 25a2868..dc1ee1d 100644 (file)
--- a/interpretor/faustio.ml
+++ b/interpretor/faustio.ml
@@ -13,17 +13,21 @@ open Beam;;
 open Aux;;
 
 let default_output_path = "../output_sounds/";;
 open Aux;;
 
 let default_output_path = "../output_sounds/";;

+let csv_read_buffer_length = 0xFFFF;;

 
 class virtual io = 
   object
     method virtual read : string array -> beam
 
 class virtual io = 
   object
     method virtual read : string array -> beam

-    method virtual write : int array -> value_type array array -> string array
-    method private to_float : value_type array array -> float array array = 
-      fun (origin : value_type array array) ->
-       let data = 
-         let value2float = fun (v : value_type) -> v#to_float_array in
-         Array.map (Array.map value2float) origin in
-       Array.map Array.concat (Array.map Array.to_list data)
+    method virtual write : int array -> float array array array -> string array
+    method private concat : float array array array -> float array array = 
+      fun (origin : float array array array) ->
+       Array.map Array.concat (Array.map Array.to_list origin)
+    method private channels : float array array array -> int array = 
+      fun data ->
+       let get_channel = fun s -> 
+         let l = Array.length s in
+         Array.length s.(l - 1) in
+       Array.map get_channel data  

   end;;
 
 class waveio : io_type = 
   end;;
 
 class waveio : io_type = 


@@ -49,9 +53,9 @@ class waveio : io_type =
            array_map2 (new signal) rates (Array.map stream2func containers) in
          new beam signals
 
            array_map2 (new signal) rates (Array.map stream2func containers) in
          new beam signals
 

-    method write : int array -> value_type array array -> string array = 
+    method write : int array -> float array array array -> string array = 

       fun (rates : int array) ->
       fun (rates : int array) ->

-       fun (output : value_type array array) ->
+       fun (output : float array array array) ->

          let () = print_string("    Faustine -> Writing wave files...") in
          let tic = Sys.time () in
 
          let () = print_string("    Faustine -> Writing wave files...") in
          let tic = Sys.time () in
 


@@ -60,20 +64,15 @@ class waveio : io_type =
            default_output_path ^ "output" ^ (string_of_int (i + 1)) ^ ".wav") in
 
          let files = 
            default_output_path ^ "output" ^ (string_of_int (i + 1)) ^ ".wav") in
 
          let files = 

-           let channels = 
-             let get_channel = fun s -> 
-               let l = Array.length s in
-               match s.(l - 1)#get with
-               | Vec vec -> vec#size
-               | _ -> 1 in
-             Array.map get_channel output in       
+           let channels = self#channels output in 

            let file_format = Sndfile.format 
                Sndfile.MAJOR_WAV Sndfile.MINOR_PCM_16 in
            let openwr = fun path -> fun channel -> fun rate ->
              Sndfile.openfile ~info:(Sndfile.RDWR, file_format, channel, rate) path in
            array_map3 openwr paths channels rates in 
            let file_format = Sndfile.format 
                Sndfile.MAJOR_WAV Sndfile.MINOR_PCM_16 in
            let openwr = fun path -> fun channel -> fun rate ->
              Sndfile.openfile ~info:(Sndfile.RDWR, file_format, channel, rate) path in
            array_map3 openwr paths channels rates in 

+

          let () = 
          let () = 

-           let data = self#to_float output in
+           let data = self#concat output in

            let _ = array_map2 Sndfile.write files data in
            let _ = Array.map Sndfile.close files in
            let toc = Sys.time () in
            let _ = array_map2 Sndfile.write files data in
            let _ = Array.map Sndfile.close files in
            let toc = Sys.time () in


@@ -84,91 +83,64 @@ class waveio : io_type =
   end;;
 
 
   end;;
 
 

-(*
+

 class csvio : io_type = 
   object (self)
     inherit io
 class csvio : io_type = 
   object (self)
     inherit io

-    method private csvread = 
-    method read : string array -> beam =
-      
+    method private csvread : in_channel -> signal = 
+      fun (ic : in_channel) ->
+       let buffer = Buffer.create csv_read_buffer_length in
+       let () = 
+         try
+           while true do
+             Buffer.add_string buffer (input_line ic);
+             Buffer.add_char buffer '\t';
+           done; 
+         with End_of_file -> () in
+       let content = Buffer.contents buffer in
+       let lines = Str.split (Str.regexp "\t") content in
+       let elements = List.map (Str.split (Str.regexp ",")) lines in
+       let data = 
+         let data_in_list = List.map (List.map float_of_string) elements in
+         Array.of_list (List.map Array.of_list data_in_list) in      
+       let values = 
+         let convertor = new value Zero in
+         Array.map (convertor#of_float_array) data in
+       new signal 0 (Array.get values)

 
 

+    method read : string array -> beam =
+      fun (paths : string array) ->
+       let files = Array.map open_in paths in
+       let signals = Array.map self#csvread files in
+       new beam signals

 
 

-    method write : value_type array array -> string array
+    method write : int array -> float array array array -> string array = 
+      fun (rates : int array) ->
+       fun (data : float array array array) ->
+         let () = print_string("    Faustine -> Writing csv files...") in
+         let tic = Sys.time () in
+         
+         let paths = 
+           let n = Array.length data in
+           let path_pattern = fun i -> 
+             default_output_path ^ "output" ^ (string_of_int (i + 1)) ^ ".csv" in
+           Array.init n path_pattern in          
+
+         let files = Array.map open_out paths in
+         let strings = 
+           let value2string : float array -> string =
+             fun (v : float array) ->
+               let strings = Array.map string_of_float v in
+               String.concat "," (Array.to_list strings) in
+           let signal2string : float array array -> string = 
+             fun (s : float array array) -> 
+               let lines = Array.map value2string s in
+               String.concat "\n" (Array.to_list lines) in
+           Array.map signal2string data in
+         let _ = array_map2 output_string files strings in
+         let _ = Array.map close_out files in
+         let toc = Sys.time () in
+         let () = print_endline 
+             (" Done. (duration: " ^ (string_of_float (toc -. tic)) ^ "s)") in
+         paths

   end;;
   end;;

-*)
-
-
-(*
-let csvread = fun (ic : in_channel) ->
-  let string_list = ref [] in
-  try
-    while true do
-      string_list := !string_list @ [(input_line ic)]
-    done;
-    [||]
-  with End_of_file ->
-    (*let () = print_endline(List.nth !string_list 0) in*)
-    Array.of_list (List.map float_of_string !string_list);;
-
-let read_input_csv = fun argv ->
-        let n_input = (Array.length argv) - 4 in
-       if n_input < 0 then 
-               raise (Invalid_argument "xxx")
-       else if n_input = 0 then 
-               ([], [])
-       else
-               (* open csv file *)
-               let file_string_array = Array.sub argv 4 n_input in
-               let make_chemin s = io_macro_to_string Input_Route_string ^ s in
-               let file_chemin_string_array = Array.map make_chemin file_string_array in
-               let file_array = Array.map open_in file_chemin_string_array in
-               let file_list = Array.to_list file_array in
-
-               (* read sample rates and data *)
-               let rate_list = Array.to_list (Array.create n_input 0) in
-               let data_float_array_list = List.map csvread file_list in
-               let _ = List.map close_in file_list in
-               (rate_list, data_float_array_list);;
-
-
-let write_output_csv = fun channel_int_list -> fun data_float_array_list ->
-        let () = print_string("    Faustine -> Writing csv files...") in
-       let tic = Sys.time () in
-
-       (* make output txt file names : output0, output1, ... *)
-       let n_output = List.length data_float_array_list in
-       let n_array = Array.init n_output (fun n -> n) in
-       let make_file_name i = "output" ^ (string_of_int i) ^ ".csv" in
-
-       (* make output wave file routes *)
-       let make_chemin s = io_macro_to_string Output_Route_string ^ s in
-       let file_name_string_array = Array.map make_file_name n_array in
-       let file_chemin_string_array = Array.map make_chemin file_name_string_array in
-       let file_chemin_string_list = Array.to_list file_chemin_string_array in
-
-       (* open output channels *)
-        let file_list = List.map open_out file_chemin_string_list in
-       let data_string_array_list = List.map (Array.map string_of_float) data_float_array_list in
-       let array_to_string = fun data_string_array -> fun channel_int ->
-         let data_length = Array.length data_string_array in
-         let rec to_string_rec = 
-           fun data -> fun channel -> fun n -> fun i -> fun column ->
-             if i < n then 
-               (
-               let element = data.(i) in
-               if column < (channel - 1) then 
-                 element ^ "," ^ (to_string_rec data channel n (i + 1) (column + 1))
-               else if column = (channel - 1) then
-                 element ^ "\n" ^ (to_string_rec data channel n (i + 1) 0)
-               else raise (Invalid_argument "write_output_txt.")
-                   )
-             else "" in
-         to_string_rec data_string_array channel_int data_length 0 0 in
-
-       let data_string_list = List.map2 array_to_string data_string_array_list channel_int_list in
-       let _ = List.map2 output_string file_list data_string_list in
-       let _ = List.map close_out file_list in
-       let toc = Sys.time () in
-       print_endline(" Done. (duration: " ^ (string_of_float (toc -. tic)) ^ "s)");;
-
-*)