made the factorization a separate routine

This commit is contained in:
Mark Borgerding
2003-11-12 01:09:35 +00:00
parent 140f106743
commit 206e28f11c
6 changed files with 156 additions and 87 deletions

39
fft.py
View File

@ -15,19 +15,19 @@ def fft(f):
else:
raise Exception('%s not factorable ' % n)
print 'n=%d,p=%d' % (n,p)
print f,' << fin'
#print 'n=%d,p=%d' % (n,p)
#print f,' << fin'
m = n/p
Fout=[]
for q in range(p): # 0,1
fp = f[q::p]
print fp,'<< fp'
#print fp,'<< fp'
Fp = fft( fp )
Fout.extend( Fp )
for u in range(m):
scratch = Fout[u::m] # u to end in strides of m
print scratch
#print scratch
for q1 in range(p):
k = q1*m + u # indices to Fout above that became scratch
Fout[ k ] = scratch[0] # cuz e**0==1 in loop below
@ -37,6 +37,37 @@ def fft(f):
return Fout
def real_fft( f ):
broken
N = len(f) / 2
res = f[::2]
ims = f[1::2]
fp = [ complex(r,i) for r,i in zip(res,ims) ]
Fp = fft( fp )
Fpr = [ c.real for c in Fp ]
Fpi = [ c.imag for c in Fp ]
F1 = [complex(0,0)]*(N+1)
F2 = [complex(0,0)]*(N+1)
F1[0] = complex( Fpr[0] , 0 )
F2[0] = complex( Fpi[0] , 0 )
#F1[N] = complex( Fpr[N] , 0 )
#F2[N] = complex( Fpi[N] , 0 )
for k in range(1,N):
F1[k] = complex( (Fpr[k]+Fpr[N-k])/2 , j*(Fpi[k]-Fpi[N-k])/2 )
F2[k] = complex( (Fpi[k]+Fpi[N-k])/2 , j*(Fpr[k]-Fpr[N-k])/2 )
F = [ complex(0,0) ] * ( N + 1 )
for k in range(N+1):
F[k] = F1[k] + e ** ( j*pi*k/N ) * F2[k]
return F
def test(f=range(1024),ntimes=10):
import time
t0 = time.time()