Options are implemented and fft2d.dsp test success.

[Faustine.git] / dsp_files / fft2d.dsp

diff --git a/dsp_files/fft2d.dsp b/dsp_files/fft2d.dsp
index 15ba841..870c1e2 100644 (file)
--- a/dsp_files/fft2d.dsp
+++ b/dsp_files/fft2d.dsp
@@ -1,5 +1,5 @@
-import ( "fft.lib.dsp" ) ;
-import ( "complex.lib" ) ;
+import ( "mrfaustlib/fft.lib" ) ;
+import ( "mrfaustlib/complex.lib" ) ;

 
 GREY_MAX = 256;
 
 
 GREY_MAX = 256;
 


@@ -25,7 +25,8 @@ matrix_pcplx2modul(n, m) = _ <: picks(n) : par(i, n, ( _ <: picks(m) : pcplx_mod
 
 matrix_real2pcplx(n, m) = _ <: picks(n) : par(i, n, ( _ <: picks(m) : real2pcplx(m) : nconcat(m))) : nconcat(n);
 
 
 matrix_real2pcplx(n, m) = _ <: picks(n) : par(i, n, ( _ <: picks(m) : real2pcplx(m) : nconcat(m))) : nconcat(n);
 

-normalize(n) = _ , n : /;
+//normalize(n) = _ , n : /;
+normalize(n, m) = _, (m : vectorize(n)) : /;

 
 unnormalize(n) = par(i, n, ( _ , GREY_MAX : *));
 
 
 unnormalize(n) = par(i, n, ( _ , GREY_MAX : *));
 


@@ -39,6 +40,11 @@ output(n, m) = serialize;
 //fft2d(x, y) = matricize(x, y) : output(x, y);
 fft2d(x, y) = normalize(GREY_MAX) : matricize(x, y) : lines_fft(x, y) : matrix_transpose(x, y) : lines_fftc(y, x) : matrix_transpose(y, x) : norm_out(x, y);
 
 //fft2d(x, y) = matricize(x, y) : output(x, y);
 fft2d(x, y) = normalize(GREY_MAX) : matricize(x, y) : lines_fft(x, y) : matrix_transpose(x, y) : lines_fftc(y, x) : matrix_transpose(y, x) : norm_out(x, y);
 

+new_fft2d(x, y) = normalize(y, GREY_MAX) : vectorize(x) : lines_fft(x, y) : matrix_transpose(x, y) : lines_fftc(y, x) : matrix_transpose(y, x) : norm_out(x, y);
+

 //safer with x=y because tests and zero padding are still to implement
 //safer with x=y because tests and zero padding are still to implement

-process = fft2d(32,32);
+//process = fft2d(32,32);
+process = new_fft2d(32,32);
+
+