wassname/scikit-image
1
0
Fork 0
mirror of https://github.com/wassname/scikit-image.git synced 2026-07-06 03:41:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

styles code (no more functions, less lines)

Browse Source
This commit is contained in:
scottsievert
2015-12-15 19:19:14 -06:00
parent 2892e90abc
commit fb99e3cce6
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skimage/restoration/deconvolution.py
+3 -6
View File
@@ -368,15 +368,12 @@ def richardson_lucy(image, psf, iterations=50, clip=True):
# compute the times for direct convolution and the fft method. The fft is of
# complexity O(N log(N)) for each dimension and the direct method does
# straight arithmetic (and is O(n*k) to add n elements k times)
def direct_time(img_shape, kernel_shape):
return np.prod(img_shape + kernel_shape)
def fft_time(img_shape, kernel_shape):
return np.sum([n*np.log(n) for n in img_shape+kernel_shape])
direct_time = np.prod(image.shape + psf.shape)
fft_time = np.sum([n*np.log(n) for n in image.shape + psf.shape])
# see whether the fourier transform convolution method or the direct
# convolution method is faster (discussed in scikit-image PR #1792)
time_ratio = 40.032 * fft_time(image.shape, psf.shape)
time_ratio /= direct_time(image.shape, psf.shape)
time_ratio = 40.032 * fft_time / direct_time
if time_ratio <= 1 or len(image.shape) > 2:
convolve_method = fftconvolve