From 06065f640a0e4ff895c884102e8a2345b5fcd7fd Mon Sep 17 00:00:00 2001 From: Emmanuelle Gouillart Date: Mon, 27 Aug 2012 16:23:11 +0200 Subject: [PATCH] PEP 8: _quickshift module --- skimage/segmentation/_quickshift.pyx | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/skimage/segmentation/_quickshift.pyx b/skimage/segmentation/_quickshift.pyx index 57be1040..b465eb08 100644 --- a/skimage/segmentation/_quickshift.pyx +++ b/skimage/segmentation/_quickshift.pyx @@ -13,8 +13,8 @@ from ..color import rgb2lab @cython.boundscheck(False) @cython.wraparound(False) @cython.cdivision(True) -def quickshift(image, ratio=1., float kernel_size=5, max_dist=10, return_tree=False, - sigma=0, convert2lab=True, random_seed=None): +def quickshift(image, ratio=1., float kernel_size=5, max_dist=10, + return_tree=False, sigma=0, convert2lab=True, random_seed=None): """Segments image using quickshift clustering in Color-(x,y) space. Produces an oversegmentation of the image using the quickshift mode-seeking @@ -106,7 +106,8 @@ def quickshift(image, ratio=1., float kernel_size=5, max_dist=10, return_tree=Fa for c_ in range(c_min, c_max): dist = 0 for channel in range(channels): - dist += (current_pixel_p[channel] - image_c[r_, c_, channel])**2 + dist += (current_pixel_p[channel] - + image_c[r_, c_, channel])**2 dist += (r - r_)**2 + (c - c_)**2 densities[r, c] += exp(-dist / (2 * kernel_size**2)) current_pixel_p += channels @@ -132,9 +133,11 @@ def quickshift(image, ratio=1., float kernel_size=5, max_dist=10, return_tree=Fa if densities[r_, c_] > current_density: dist = 0 # We compute the distances twice since otherwise - # we get crazy memory overhead (width * height * windowsize**2) + # we get crazy memory overhead + # (width * height * windowsize**2) for channel in range(channels): - dist += (current_pixel_p[channel] - image_c[r_, c_, channel])**2 + dist += (current_pixel_p[channel] - + image_c[r_, c_, channel])**2 dist += (r - r_)**2 + (c - c_)**2 if dist < closest: closest = dist