wassname/scikit-image
1
0
Fork 0
mirror of https://github.com/wassname/scikit-image.git synced 2026-07-04 15:57:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Renamed fast_watershed to watershed.

Browse Source
This commit is contained in:
Emmanuelle Gouillart
2011-10-07 16:05:27 +02:00
parent 393bd94bca
commit 1c5e05442e
3 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scikits/image/morphology/__init__.py
+1 -1
View File
@@ -1,4 +1,4 @@
from grey import *
from selem import *
from ccomp import label
from watershed import watershed, fast_watershed, is_local_maximum
from watershed import watershed, is_local_maximum
scikits/image/morphology/tests/test_watershed.py
+10 -10
View File
@@ -49,7 +49,7 @@ import unittest
import numpy as np
import scipy.ndimage
from scikits.image.morphology.watershed import watershed,fast_watershed, \
from scikits.image.morphology.watershed import watershed \
_slow_watershed, is_local_maximum
eps = 1e-12
@@ -75,7 +75,7 @@ def diff(a, b):
t = ((a - b)**2).sum()
return math.sqrt(t)
class TestFastWatershed(unittest.TestCase):
class TestWatershed(unittest.TestCase):
eight = np.ones((3, 3),bool)
def test_watershed01(self):
"watershed 1"
@@ -142,7 +142,7 @@ class TestFastWatershed(unittest.TestCase):
[ 0, 0, 0, 0, 0, 0, 0],
[ 0, 0, 0, 0, 0, 0, 0]],
np.int8)
out = fast_watershed(data, markers)
out = watershed(data, markers)
error = diff([[-1, -1, -1, -1, -1, -1, -1],
[-1, -1, -1, -1, -1, -1, -1],
[-1, -1, -1, -1, -1, -1, -1],
@@ -179,7 +179,7 @@ class TestFastWatershed(unittest.TestCase):
[ 0, 0, 0, 0, 0, 0, 0],
[ 0, 0, 0, 0, 0, 0, -1]],
np.int8)
out = fast_watershed(data, markers)
out = watershed(data, markers)
error = diff([[-1, -1, -1, -1, -1, -1, -1],
[-1, 0, 2, 0, 3, 0, -1],
[-1, 2, 2, 0, 3, 3, -1],
@@ -215,7 +215,7 @@ class TestFastWatershed(unittest.TestCase):
[ 0, 0, 0, 0, 0, 0, 0],
[ 0, 0, 0, 0, 0, 0, -1]],
np.int8)
out = fast_watershed(data, markers, self.eight)
out = watershed(data, markers, self.eight)
error = diff([[-1, -1, -1, -1, -1, -1, -1],
[-1, 2, 2, 0, 3, 3, -1],
[-1, 2, 2, 0, 3, 3, -1],
@@ -251,7 +251,7 @@ class TestFastWatershed(unittest.TestCase):
[ 0, 0, 0, 0, 0, 0, 0],
[ 0, 0, 0, 0, 0, 0, -1]],
np.int8)
out = fast_watershed(data, markers, self.eight)
out = watershed(data, markers, self.eight)
error = diff([[-1, -1, -1, -1, -1, -1, -1],
[-1, 3, 3, 0, 2, 2, -1],
[-1, 3, 3, 0, 2, 2, -1],
@@ -285,7 +285,7 @@ class TestFastWatershed(unittest.TestCase):
[ 0, 0, 0, 0, 0, 0, 0],
[ -1, 0, 0, 0, 0, 0, 0]],
np.int8)
out = fast_watershed(data, markers, self.eight)
out = watershed(data, markers, self.eight)
error = diff([[-1, 1, 1, 1, 1, 1, -1],
[-1, 1, 1, 1, 1, 1, -1],
[-1, 1, 1, 1, 1, 1, -1],
@@ -324,7 +324,7 @@ class TestFastWatershed(unittest.TestCase):
markers = np.zeros(data.shape,int)
markers[6, 7] = 1
markers[14, 7] = 2
out = fast_watershed(data, markers, self.eight, mask=mask)
out = watershed(data, markers, self.eight, mask=mask)
#
# The two objects should be the same size, except possibly for the
# border region
@@ -360,7 +360,7 @@ class TestFastWatershed(unittest.TestCase):
markers = np.zeros(data.shape,int)
markers[6,7] = 1
markers[14,7] = 2
out = fast_watershed(data, markers, self.eight, mask=mask)
out = watershed(data, markers, self.eight, mask=mask)
#
# The two objects should be the same size, except possibly for the
# border region
@@ -386,7 +386,7 @@ class TestFastWatershed(unittest.TestCase):
image = scipy.ndimage.gaussian_filter(image, 4)
before = time.clock()
out = fast_watershed(image, markers, self.eight)
out = watershed(image, markers, self.eight)
elapsed = time.clock() - before
print "Fast watershed ran a megapixel image in %f seconds"%(elapsed)
before = time.clock()
scikits/image/morphology/watershed.py
+1 -2
View File
@@ -32,7 +32,7 @@ from ..filter import rank_order
import _watershed
import warnings
def fast_watershed(image, markers, connectivity=None, offset=None, mask=None):
def watershed(image, markers, connectivity=None, offset=None, mask=None):
"""
Return a matrix labeled using the watershed segmentation algorithm
@@ -219,7 +219,6 @@ def fast_watershed(image, markers, connectivity=None, offset=None, mask=None):
except:
return c_output
watershed = fast_watershed
def is_local_maximum(image, labels=None, footprint=None):
"""