From: WANG <wang@wang-OptiPlex-780.(none)>
Date: Wed, 21 Aug 2013 08:08:20 +0000 (+0200)
Subject: Bug of vector wave output error fixed.
X-Git-Url: https://svn.cri.ensmp.fr/git/Faustine.git/commitdiff_plain/f59ac471aa5a080301d70e7d7e1e81f34151ba2f

Bug of vector wave output error fixed.
---

diff --git a/dsp_files/fft.dsp b/dsp_files/fft.dsp
index 1415252..8769e5a 100644
--- a/dsp_files/fft.dsp
+++ b/dsp_files/fft.dsp
@@ -8,7 +8,7 @@ import ( "mrfaustlib/complex.lib" ) ;
 fft_test(n,m) = vectorize(n) : fft(n) : pcplx_moduls(n) : nconcat(n);
 
 //process = +, _ : + : fft_test(128);
-process = fft_test(128,128) : serialize;
+process = fft_test(128,128) : serialize : vectorize(1);
 //process = (0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7) <: shuffle(8);
 
 
diff --git a/dsp_files/mrfaustlib/fft.lib b/dsp_files/mrfaustlib/fft.lib
index 7758d04..6d29068 100644
--- a/dsp_files/mrfaustlib/fft.lib
+++ b/dsp_files/mrfaustlib/fft.lib
@@ -3,9 +3,6 @@
  *  Implementation contributed by Remy Muller
  *****************************************************************/
 
-// bus(n) : n parallel cables
-bus(2) = _,_; // avoids a lot of "bus(1)" labels in block diagrams
-bus(n) = par(i, n, _);
 
 // twiddle_mult(n) : n parallel cables
 
@@ -13,17 +10,6 @@ W(k, n) = 1, (0, ( k, ((2 * PI) / n) : *) : -) : polar_cplx;
 
 twiddle_mult(k, n) = _, W(k, n) : pcplx_mul;
 
-// selector(i,n) : select ith cable among n
-selector(i,n) = par(j, n, S(i, j))    with { S(i,i) = _; S(i,j) = !; };
-
-// interleave(m,n) : interleave m*n cables : x(0), x(m), x(2m), ..., x(1),x(1+m), x(1+2m)...
-//interleave(m,n) = bus(m*n) <: par(i, m, par(j, n, selector(i+j*m,m*n))); 
-
-// interleave(row,col) : interleave row*col cables from column order to row order.
-// input : x(0), x(1), x(2) ..., x(row*col-1)
-// output: x(0+0*row), x(0+1*row), x(0+2*row), ..., x(1+0*row), x(1+1*row), x(1+2*row), ...
-interleave(row,col) = bus(row*col) <: par(r, row, par(c, col, selector(r+c*row,row*col))); 
-
 // butterfly(n) : addition then substraction of interleaved signals : 
 xbutterfly(n) = (bus(n/2), par(k, n/2, twiddle_mult(k, n))) <: interleave(n/2,2), interleave(n/2,2) : par(i, n/2, pcplx_add), par(i, n/2, pcplx_sub);
 
diff --git a/interpretor/aux.ml b/interpretor/aux.ml
index fccb904..9463cae 100644
--- a/interpretor/aux.ml
+++ b/interpretor/aux.ml
@@ -6,6 +6,9 @@
 *)
 
 
+let array_map = fun f -> fun a ->
+  let n = Array.length a in
+  Array.init n (fun i -> f a.(i));;
 
 let array_map2 = fun f -> fun a -> fun b ->
   let n1 = Array.length a in
diff --git a/interpretor/basic.ml b/interpretor/basic.ml
index cda0c6b..3131231 100644
--- a/interpretor/basic.ml
+++ b/interpretor/basic.ml
@@ -28,17 +28,17 @@ let fun_ternary oper f g h = fun x -> oper (f x) (g x) (h x);;
 let memorize : int -> (index -> basic) -> (index -> basic) = 
   fun size ->
     fun vec ->
-      let memory_array = Array.create size Error in
-      let index_array = Array.create size false in
+      let memory = Array.create size Error in
+      let filled = Array.create size false in
       let vec_mem : index -> basic = 
 	fun i -> 
 	  if i >= 0 && i < size then (
-	    if index_array.(i) then 
-	      memory_array.(i)
+	    if filled.(i) then 
+	      memory.(i)
 	    else 
 	      let result = vec i in
-	      let () = memory_array.(i) <- result in
-	      let () = index_array.(i) <- true in
+	      let () = memory.(i) <- result in
+	      let () = filled.(i) <- true in
 	      result)
 	  else raise (Invalid_argument "vector overflow.") in 
       vec_mem;;
@@ -79,9 +79,9 @@ let basic_to_float_array : basic -> float array =
   fun v -> 
 	match v with
 	|Vec vec ->
-		let result : basic array = 
+		let basics : basic array = 
 		  Array.init vec#size vec#nth in
-		Array.map basic_to_float result
+		Array.map basic_to_float basics
 	|_ -> [| (basic_to_float v)|];;
 
 
diff --git a/interpretor/beam.ml b/interpretor/beam.ml
index c4c3b9e..ffe8128 100644
--- a/interpretor/beam.ml
+++ b/interpretor/beam.ml
@@ -70,33 +70,34 @@ class beam : signal_type array -> beam_type =
 	  let signal_at = fun (t : time) -> fun (s : signal_type) -> s#at t in
 	  Array.map (signal_at t) self#get
 
-      method output : int -> value_type array array = 
+      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 value_init = new value Error 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 value_init) in
+		(Array.make self#width init) in
 	    let index = ref 0 in
 
 	    try
 	      while !index < length_max do
-		container.(!index) <- self#at !index;
+		container.(!index) <- Array.map value2float (self#at !index);
 		incr index;
 	      done;
 	      transpose container
-	    with x ->
 
+	    with x ->
 	      let error_message = 
 		match x with
 		| Convert_Error s -> "Convert_Error: " ^ s
 		| Basic_operation s -> "Basic_operation: " ^ s
 		| Signal_operation s -> "Signal_operation: " ^ s
 		| Beam_matching s -> "Beam_Matching_Error: " ^ s
-		| _ -> "Compute finished."
+		| Invalid_argument s -> "Compute finished."
 	      in
 	      let () = print_string error_message in
 	      transpose (Array.sub container 0 !index)
diff --git a/interpretor/faustine b/interpretor/faustine
index c76b5ba..c21cebf 100755
Binary files a/interpretor/faustine and b/interpretor/faustine differ
diff --git a/interpretor/faustio.ml b/interpretor/faustio.ml
index 25a2868..b9c7598 100644
--- a/interpretor/faustio.ml
+++ b/interpretor/faustio.ml
@@ -17,13 +17,10 @@ let default_output_path = "../output_sounds/";;
 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)
   end;;
 
 class waveio : io_type = 
@@ -49,9 +46,9 @@ class waveio : io_type =
 	    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 (output : value_type array array) ->
+	fun (output : float array array array) ->
 	  let () = print_string("    Faustine -> Writing wave files...") in
 	  let tic = Sys.time () in
 
@@ -63,17 +60,16 @@ class waveio : io_type =
 	    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.length s.(l - 1) in
 	      Array.map get_channel 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 () = 
-	    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
diff --git a/interpretor/gmon.out b/interpretor/gmon.out
index 0161dc6..cf1a411 100644
Binary files a/interpretor/gmon.out and b/interpretor/gmon.out differ
diff --git a/interpretor/main.ml b/interpretor/main.ml
index 9f3e796..082fba3 100644
--- a/interpretor/main.ml
+++ b/interpretor/main.ml
@@ -71,9 +71,23 @@ let main () =
 	let rates = output#frequency in
 
 	let output_paths = wave#write rates data in
-	let _ = Array.map print_string output_paths in
+	let _ = Array.map print_endline output_paths in
 	();;
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 (*
 	try
 	        (* preprocess *)
diff --git a/interpretor/types.ml b/interpretor/types.ml
index 89f1e5f..e0eace4 100644
--- a/interpretor/types.ml
+++ b/interpretor/types.ml
@@ -124,7 +124,7 @@ class type beam_type =
       method append : beam_type -> beam_type
       method matching : int -> beam_type
       method at : time -> value_type array
-      method output : int -> value_type array array
+      method output : int -> float array array array
       method frequency : int array
     end;;
 
@@ -153,5 +153,5 @@ class type process_type =
 class type io_type = 
     object
       method read : string array -> beam_type
-      method write : int array -> value_type array array -> string array
+      method write : int array -> float array array array -> string array
     end;;