mirror/kissfft
1
0
Fork 0
mirror of https://github.com/mborgerding/kissfft.git synced 2025-06-04 01:28:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Made FFT work for T = float.

Browse Source 
Also removed some trailing spaces from line ends.
This commit is contained in:
Ralph Tandetzky 2016-09-20 14:02:49 +02:00
parent 6a8798c453
commit 64800e61d8
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
kissfft.hh
View File

@ -136,10 +136,10 @@ class kissfft
const cpx_type twiddle_mul = exp( cpx_type(0, half_phi_inc) ); const cpx_type twiddle_mul = exp( cpx_type(0, half_phi_inc) );
for ( std::size_t k = 1; 2*k < N; ++k ) for ( std::size_t k = 1; 2*k < N; ++k )
{ {
const cpx_type w = 0.5 * cpx_type( const cpx_type w = (scalar_type)0.5 * cpx_type(
dst[k].real() + dst[N-k].real(), dst[k].real() + dst[N-k].real(),
dst[k].imag() - dst[N-k].imag() ); dst[k].imag() - dst[N-k].imag() );
const cpx_type z = 0.5 * cpx_type( const cpx_type z = (scalar_type)0.5 * cpx_type(
dst[k].imag() + dst[N-k].imag(), dst[k].imag() + dst[N-k].imag(),
-dst[k].real() + dst[N-k].real() ); -dst[k].real() + dst[N-k].real() );
const cpx_type twiddle = const cpx_type twiddle =
@ -174,7 +174,7 @@ class kissfft
do{ do{
// recursive call: // recursive call:
// DFT of size m*p performed by doing // DFT of size m*p performed by doing
// p instances of smaller DFTs of size m, // p instances of smaller DFTs of size m,
// each one takes a decimated version of the input // each one takes a decimated version of the input
kf_work(stage+1, Fout , f, fstride*p,in_stride); kf_work(stage+1, Fout , f, fstride*p,in_stride);
f += fstride*in_stride; f += fstride*in_stride;
@ -183,7 +183,7 @@ class kissfft
Fout=Fout_beg; Fout=Fout_beg;
// recombine the p smaller DFTs // recombine the p smaller DFTs
switch (p) { switch (p) {
case 2: kf_bfly2(Fout,fstride,m); break; case 2: kf_bfly2(Fout,fstride,m); break;
case 3: kf_bfly3(Fout,fstride,m); break; case 3: kf_bfly3(Fout,fstride,m); break;
@ -290,7 +290,7 @@ class kissfft
scratch[7].imag()*ya.real() + scratch[8].imag()*yb.real() scratch[7].imag()*ya.real() + scratch[8].imag()*yb.real()
); );
scratch[6] = cpx_type( scratch[6] = cpx_type(
scratch[10].imag()*ya.imag() + scratch[9].imag()*yb.imag(), scratch[10].imag()*ya.imag() + scratch[9].imag()*yb.imag(),
-scratch[10].real()*ya.imag() - scratch[9].real()*yb.imag() -scratch[10].real()*ya.imag() - scratch[9].real()*yb.imag()
); );
@ -298,7 +298,7 @@ class kissfft
*Fout1 = scratch[5] - scratch[6]; *Fout1 = scratch[5] - scratch[6];
*Fout4 = scratch[5] + scratch[6]; *Fout4 = scratch[5] + scratch[6];
scratch[11] = scratch[0] + scratch[11] = scratch[0] +
cpx_type( cpx_type(
scratch[7].real()*yb.real() + scratch[8].real()*ya.real(), scratch[7].real()*yb.real() + scratch[8].real()*ya.real(),
scratch[7].imag()*yb.real() + scratch[8].imag()*ya.real() scratch[7].imag()*yb.real() + scratch[8].imag()*ya.real()