wassname/scikit-image
1
0
Fork 0
mirror of https://github.com/wassname/scikit-image.git synced 2026-07-13 17:45:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixes import, tuple addition

Browse Source
This commit is contained in:
scottsievert
2015-12-12 19:26:10 -06:00
parent 1be8336599
commit 3f3b705ebd
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skimage/restoration/deconvolution.py
+3 -3
View File
@@ -7,7 +7,7 @@ from __future__ import division
import numpy as np
import numpy.random as npr
from scipy.signal import fftconvolve
from scipy.signal import fftconvolve, convolve2d
from . import uft
@@ -369,8 +369,8 @@ def richardson_lucy(image, psf, iterations=50, clip=True):
def fft_time(m, n, k, l):
return m*np.log(m) + n*np.log(n) + k*np.log(k) + l*np.log(l)
time_ratio = 71.468 * fft_time(*image.shape, *psf.shape)
time_ratio /= direct_time(*image.shape, *psf.shape)
time_ratio = 71.468 * fft_time(*(image.shape + psf.shape))
time_ratio /= direct_time(*(image.shape + psf.shape))
convolve_method = fftconvolve if time_ratio <= 1 else convolve2d
image = image.astype(np.float)