[Scipy-svn] r4331 - in branches/refactor_fft/scipy/fftpack: . tests
scipy-svn at scipy.org
scipy-svn at scipy.org
Thu May 15 08:27:59 EDT 2008
Author: cdavid
Date: 2008-05-15 07:27:46 -0500 (Thu, 15 May 2008)
New Revision: 4331
Modified:
branches/refactor_fft/scipy/fftpack/basic.py
branches/refactor_fft/scipy/fftpack/pseudo_diffs.py
branches/refactor_fft/scipy/fftpack/tests/test_basic.py
Log:
reflect C api name changes in python modules.
Modified: branches/refactor_fft/scipy/fftpack/basic.py
===================================================================
--- branches/refactor_fft/scipy/fftpack/basic.py 2008-05-15 12:27:12 UTC (rev 4330)
+++ branches/refactor_fft/scipy/fftpack/basic.py 2008-05-15 12:27:46 UTC (rev 4331)
@@ -79,12 +79,12 @@
if istype(tmp, numpy.complex128):
overwrite_x = overwrite_x or (tmp is not x and not \
hasattr(x,'__array__'))
- work_function = fftpack.zfft
+ work_function = fftpack.zfft_fftpack
elif istype(tmp, numpy.complex64):
raise NotImplementedError
else:
overwrite_x = 1
- work_function = fftpack.zrfft
+ work_function = fftpack.zrfft_fftpack
#return _raw_fft(tmp,n,axis,1,overwrite_x,work_function)
if n is None:
@@ -117,12 +117,12 @@
if istype(tmp, numpy.complex128):
overwrite_x = overwrite_x or (tmp is not x and not \
hasattr(x,'__array__'))
- work_function = fftpack.zfft
+ work_function = fftpack.zfft_fftpack
elif istype(tmp, numpy.complex64):
raise NotImplementedError
else:
overwrite_x = 1
- work_function = fftpack.zrfft
+ work_function = fftpack.zrfft_fftpack
#return _raw_fft(tmp,n,axis,-1,overwrite_x,work_function)
if n is None:
@@ -169,7 +169,7 @@
tmp = asarray(x)
if not numpy.isrealobj(tmp):
raise TypeError,"1st argument must be real sequence"
- work_function = fftpack.drfft
+ work_function = fftpack.drfft_fftpack
return _raw_fft(tmp,n,axis,1,overwrite_x,work_function)
@@ -213,7 +213,7 @@
tmp = asarray(x)
if not numpy.isrealobj(tmp):
raise TypeError,"1st argument must be real sequence"
- work_function = fftpack.drfft
+ work_function = fftpack.drfft_fftpack
return _raw_fft(tmp,n,axis,-1,overwrite_x,work_function)
@@ -285,12 +285,12 @@
if istype(tmp, numpy.complex128):
overwrite_x = overwrite_x or (tmp is not x and not \
hasattr(x,'__array__'))
- work_function = fftpack.zfftnd
+ work_function = fftpack.zfftnd_fftpack
elif istype(tmp, numpy.complex64):
raise NotImplementedError
else:
overwrite_x = 1
- work_function = fftpack.zfftnd
+ work_function = fftpack.zfftnd_fftpack
return _raw_fftnd(tmp,shape,axes,1,overwrite_x,work_function)
@@ -313,12 +313,12 @@
if istype(tmp, numpy.complex128):
overwrite_x = overwrite_x or (tmp is not x and not \
hasattr(x,'__array__'))
- work_function = fftpack.zfftnd
+ work_function = fftpack.zfftnd_fftpack
elif istype(tmp, numpy.complex64):
raise NotImplementedError
else:
overwrite_x = 1
- work_function = fftpack.zfftnd
+ work_function = fftpack.zfftnd_fftpack
return _raw_fftnd(tmp,shape,axes,-1,overwrite_x,work_function)
Modified: branches/refactor_fft/scipy/fftpack/pseudo_diffs.py
===================================================================
--- branches/refactor_fft/scipy/fftpack/pseudo_diffs.py 2008-05-15 12:27:12 UTC (rev 4330)
+++ branches/refactor_fft/scipy/fftpack/pseudo_diffs.py 2008-05-15 12:27:46 UTC (rev 4331)
@@ -12,7 +12,7 @@
import convolve
import atexit
-atexit.register(convolve.destroy_convolve_cache)
+atexit.register(convolve.destroy_convolve_cache_fftpack)
del atexit
@@ -60,11 +60,11 @@
if k:
return pow(c*k,order)
return 0
- omega = convolve.init_convolution_kernel(n,kernel,d=order,
+ omega = convolve.init_convolution_kernel_fftpack(n,kernel,d=order,
zero_nyquist=1)
_cache[(n,order,c)] = omega
overwrite_x = tmp is not x and not hasattr(x,'__array__')
- return convolve.convolve(tmp,omega,swap_real_imag=order%2,
+ return convolve.convolve_fftpack(tmp,omega,swap_real_imag=order%2,
overwrite_x=overwrite_x)
del _cache
@@ -110,10 +110,10 @@
def kernel(k,h=h):
if k: return 1.0/tanh(h*k)
return 0
- omega = convolve.init_convolution_kernel(n,kernel,d=1)
+ omega = convolve.init_convolution_kernel_fftpack(n,kernel,d=1)
_cache[(n,h)] = omega
overwrite_x = tmp is not x and not hasattr(x,'__array__')
- return convolve.convolve(tmp,omega,swap_real_imag=1,overwrite_x=overwrite_x)
+ return convolve.convolve_fftpack(tmp,omega,swap_real_imag=1,overwrite_x=overwrite_x)
del _cache
@@ -146,10 +146,10 @@
def kernel(k,h=h):
if k: return -tanh(h*k)
return 0
- omega = convolve.init_convolution_kernel(n,kernel,d=1)
+ omega = convolve.init_convolution_kernel_fftpack(n,kernel,d=1)
_cache[(n,h)] = omega
overwrite_x = tmp is not x and not hasattr(x,'__array__')
- return convolve.convolve(tmp,omega,swap_real_imag=1,overwrite_x=overwrite_x)
+ return convolve.convolve_fftpack(tmp,omega,swap_real_imag=1,overwrite_x=overwrite_x)
del _cache
@@ -183,10 +183,10 @@
if k>0: return 1.0
elif k<0: return -1.0
return 0.0
- omega = convolve.init_convolution_kernel(n,kernel,d=1)
+ omega = convolve.init_convolution_kernel_fftpack(n,kernel,d=1)
_cache[n] = omega
overwrite_x = tmp is not x and not hasattr(x,'__array__')
- return convolve.convolve(tmp,omega,swap_real_imag=1,overwrite_x=overwrite_x)
+ return convolve.convolve_fftpack(tmp,omega,swap_real_imag=1,overwrite_x=overwrite_x)
del _cache
@@ -242,10 +242,10 @@
def kernel(k,a=a,b=b):
if k: return -cosh(a*k)/sinh(b*k)
return 0
- omega = convolve.init_convolution_kernel(n,kernel,d=1)
+ omega = convolve.init_convolution_kernel_fftpack(n,kernel,d=1)
_cache[(n,a,b)] = omega
overwrite_x = tmp is not x and not hasattr(x,'__array__')
- return convolve.convolve(tmp,omega,swap_real_imag=1,overwrite_x=overwrite_x)
+ return convolve.convolve_fftpack(tmp,omega,swap_real_imag=1,overwrite_x=overwrite_x)
del _cache
@@ -288,10 +288,10 @@
def kernel(k,a=a,b=b):
if k: return sinh(a*k)/cosh(b*k)
return 0
- omega = convolve.init_convolution_kernel(n,kernel,d=1)
+ omega = convolve.init_convolution_kernel_fftpack(n,kernel,d=1)
_cache[(n,a,b)] = omega
overwrite_x = tmp is not x and not hasattr(x,'__array__')
- return convolve.convolve(tmp,omega,swap_real_imag=1,overwrite_x=overwrite_x)
+ return convolve.convolve_fftpack(tmp,omega,swap_real_imag=1,overwrite_x=overwrite_x)
del _cache
@@ -333,10 +333,10 @@
def kernel(k,a=a,b=b):
if k: return sinh(a*k)/sinh(b*k)
return float(a)/b
- omega = convolve.init_convolution_kernel(n,kernel)
+ omega = convolve.init_convolution_kernel_fftpack(n,kernel)
_cache[(n,a,b)] = omega
overwrite_x = tmp is not x and not hasattr(x,'__array__')
- return convolve.convolve(tmp,omega,overwrite_x=overwrite_x)
+ return convolve.convolve_fftpack(tmp,omega,overwrite_x=overwrite_x)
del _cache
@@ -378,10 +378,10 @@
while _cache: _cache.popitem()
def kernel(k,a=a,b=b):
return cosh(a*k)/cosh(b*k)
- omega = convolve.init_convolution_kernel(n,kernel)
+ omega = convolve.init_convolution_kernel_fftpack(n,kernel)
_cache[(n,a,b)] = omega
overwrite_x = tmp is not x and not hasattr(x,'__array__')
- return convolve.convolve(tmp,omega,overwrite_x=overwrite_x)
+ return convolve.convolve_fftpack(tmp,omega,overwrite_x=overwrite_x)
del _cache
_cache = {}
@@ -412,15 +412,15 @@
while _cache: _cache.popitem()
def kernel_real(k,a=a): return cos(a*k)
def kernel_imag(k,a=a): return sin(a*k)
- omega_real = convolve.init_convolution_kernel(n,kernel_real,d=0,
+ omega_real = convolve.init_convolution_kernel_fftpack(n,kernel_real,d=0,
zero_nyquist=0)
- omega_imag = convolve.init_convolution_kernel(n,kernel_imag,d=1,
+ omega_imag = convolve.init_convolution_kernel_fftpack(n,kernel_imag,d=1,
zero_nyquist=0)
_cache[(n,a)] = omega_real,omega_imag
else:
omega_real,omega_imag = omega
overwrite_x = tmp is not x and not hasattr(x,'__array__')
- return convolve.convolve_z(tmp,omega_real,omega_imag,
+ return convolve.convolve_z_fftpack(tmp,omega_real,omega_imag,
overwrite_x=overwrite_x)
del _cache
Modified: branches/refactor_fft/scipy/fftpack/tests/test_basic.py
===================================================================
--- branches/refactor_fft/scipy/fftpack/tests/test_basic.py 2008-05-15 12:27:12 UTC (rev 4330)
+++ branches/refactor_fft/scipy/fftpack/tests/test_basic.py 2008-05-15 12:27:46 UTC (rev 4331)
@@ -13,7 +13,6 @@
import sys
from scipy.testing import *
from scipy.fftpack import ifft,fft,fftn,ifftn,rfft,irfft
-from scipy.fftpack import _fftpack as fftpack
from numpy import arange, add, array, asarray, zeros, dot, exp, pi,\
swapaxes, double, cdouble
@@ -118,10 +117,10 @@
for i in range(2,14):
n = 2**i
x = range(n)
- y = fftpack.zfft(x)
+ y = fft(x)
y2 = numpy.fft.fft(x)
assert_array_almost_equal(y,y2)
- y = fftpack.zrfft(x)
+ y = fft(x)
assert_array_almost_equal(y,y2)
@@ -145,10 +144,10 @@
for i in range(2,14):
n = 2**i
x = range(n)
- y = fftpack.zfft(x,direction=-1)
+ y = ifft(x)
y2 = numpy.fft.ifft(x)
assert_array_almost_equal(y,y2)
- y = fftpack.zrfft(x,direction=-1)
+ y = ifft(x)
assert_array_almost_equal(y,y2)
def test_random_complex(self):
@@ -189,7 +188,7 @@
for k in range(1,n/2):
y1[2*k-1] = y2[k].real
y1[2*k] = y2[k].imag
- y = fftpack.drfft(x)
+ y = rfft(x)
assert_array_almost_equal(y,y1)
@@ -221,7 +220,7 @@
x1[n-k] = x[2*k-1]-1j*x[2*k]
x1[n/2] = x[-1]
y1 = numpy_ifft(x1)
- y = fftpack.drfft(x,direction=-1)
+ y = irfft(x)
assert_array_almost_equal(y,y1)
def test_random_real(self):
More information about the Scipy-svn
mailing list