X-Git-Url: https://scm.cri.ensmp.fr/git/Faustine.git/blobdiff_plain/06159b51a934937f647ec7119b47cb466d8e50b1..d1f93175cc683d72876cb56b4a8f566578296bb9:/dsp_files/fft.dsp diff --git a/dsp_files/fft.dsp b/dsp_files/fft.dsp index 949f079..34a795e 100644 --- a/dsp_files/fft.dsp +++ b/dsp_files/fft.dsp @@ -1,31 +1,18 @@ -import ( "complex.lib" ) ; -import ( "fft.lib.dsp" ) ; +import ( "mrfaustlib/fft.lib" ) ; +import ( "mrfaustlib/complex.lib" ) ; -concats = case { - (1) => _, 1 : vectorize ; - (m) => concats(m - 1), ( _, 1 : vectorize) : #; -}; -//subvect_even(n) = par(i, (n/2), (_, (i, 2 : *) : [])) : concats(n/2); -//subvect_odd(n) = par(i, (n/2), (_, (i, 2 : * : _, 1 : +) : [])) : concats(n/2); -evens = case { - (2) => [0] : vectorize(1); - (n) => evens(n-2) # ((_, (n-2) : []) : vectorize(1)); -}; +//fft_test(n,m) = _ : overlap(n,m) <: picks(n) : real2complex(n) : fft(n) : stops(n/2), pcplx_moduls(n/2) : modules_vector(n/2); +//fft_test(n,m) = _ : overlap(n,m) : fft(n) : stops(n/2), pcplx_moduls(n/2) : nconcat(n/2); +fft_test(n,m) = vectorize(n) : fft(n) : pcplx_moduls(n) : nconcat(n); + +//process = +, _ : + : fft_test(128); +process = fft_test(128,128); +//process = (0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7) <: shuffle(8); -odds = case { - (2) => [1] : vectorize(1); - (n) => odds(n - 2) # ((_, (n-1) : []) : vectorize(1)); -}; -subvect_even(n) = _ <: evens(n); -subvect_odd(n) = _ <: odds(n); -eo(n) = _ <: subvect_even(n), subvect_odd(n); -output = serialize, serialize : vectorize(1), vectorize(1) : #; -//process = (1,2,3,4,5,6,7,8) : evens(8); -process = _ : vectorize(8) : eo(8) : output; \ No newline at end of file