From 12fb4cbb860c992f035e235e28fec829b9e55726 Mon Sep 17 00:00:00 2001 From: Vighnesh Birodkar Date: Mon, 30 Mar 2015 13:02:25 +0530 Subject: [PATCH] Removed debug print and corrected formatting --- skimage/transform/__init__.py | 4 ++-- skimage/transform/_seam_carving.pyx | 1 - skimage/transform/seam_carving.py | 2 +- skimage/transform/tests/test_seam_carving.py | 4 ++++ 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/skimage/transform/__init__.py b/skimage/transform/__init__.py index 05484887..9b40b3a9 100644 --- a/skimage/transform/__init__.py +++ b/skimage/transform/__init__.py @@ -12,7 +12,7 @@ from ._geometric import (warp, warp_coords, estimate_transform, from ._warps import swirl, resize, rotate, rescale, downscale_local_mean from .pyramids import (pyramid_reduce, pyramid_expand, pyramid_gaussian, pyramid_laplacian) -from seam_carving import seam_carve +from .seam_carving import seam_carve __all__ = ['hough_circle', @@ -45,4 +45,4 @@ __all__ = ['hough_circle', 'pyramid_expand', 'pyramid_gaussian', 'pyramid_laplacian', - 'seam_carve'] + 'seam_carve'] diff --git a/skimage/transform/_seam_carving.pyx b/skimage/transform/_seam_carving.pyx index 188c8dcb..86f3634a 100644 --- a/skimage/transform/_seam_carving.pyx +++ b/skimage/transform/_seam_carving.pyx @@ -78,7 +78,6 @@ cdef find_seam_v(cnp.double_t[:, ::1] energy_img, cnp.int8_t[:, ::1] track_img, for row in range(rows-2, -1, -1): col = seam[row + 1] offset = track_img[row, col] - #print offset seam[row] = seam[row + 1] + offset return seam diff --git a/skimage/transform/seam_carving.py b/skimage/transform/seam_carving.py index 0777e377..beba4bb4 100644 --- a/skimage/transform/seam_carving.py +++ b/skimage/transform/seam_carving.py @@ -1,4 +1,4 @@ -from _seam_carving import _seam_carve_v +from ._seam_carving import _seam_carve_v from .. import util from .._shared import utils import numpy as np diff --git a/skimage/transform/tests/test_seam_carving.py b/skimage/transform/tests/test_seam_carving.py index d17eee25..40758648 100644 --- a/skimage/transform/tests/test_seam_carving.py +++ b/skimage/transform/tests/test_seam_carving.py @@ -32,3 +32,7 @@ def test_seam_carving(): out = transform.seam_carve(img3, 'vertical', 1, energy, border=0) testing.assert_allclose(out, 0) + + +if __name__ == '__main__': + np.testing.run_module_suite()