From 3f3b705ebdbba42a430db96621778df4a882b836 Mon Sep 17 00:00:00 2001 From: scottsievert Date: Sat, 12 Dec 2015 19:26:10 -0600 Subject: [PATCH] fixes import, tuple addition --- skimage/restoration/deconvolution.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/skimage/restoration/deconvolution.py b/skimage/restoration/deconvolution.py index 6d922aa2..18259127 100644 --- a/skimage/restoration/deconvolution.py +++ b/skimage/restoration/deconvolution.py @@ -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)