wassname/scikit-image
1
0
Fork 0
mirror of https://github.com/wassname/scikit-image.git synced 2026-07-02 10:29:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove deprecated use of relabel_from_one

Browse Source
This commit is contained in:
Juan Nunez-Iglesias
2013-10-03 16:14:30 +10:00
parent bfab493133
commit a8488bfecd
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skimage/segmentation/_join.py
+6 -6
View File
@@ -5,9 +5,9 @@ from skimage._shared.utils import deprecated
def join_segmentations(s1, s2):
"""Return the join of the two input segmentations.
The join J of S1 and S2 is defined as the segmentation in which two voxels
are in the same segment in J if and only if they are in the same segment
in *both* S1 and S2.
The join J of S1 and S2 is defined as the segmentation in which two
voxels are in the same segment if and only if they are in the same
segment in *both* S1 and S2.
Parameters
----------
@@ -36,10 +36,10 @@ def join_segmentations(s1, s2):
if s1.shape != s2.shape:
raise ValueError("Cannot join segmentations of different shape. " +
"s1.shape: %s, s2.shape: %s" % (s1.shape, s2.shape))
s1 = relabel_from_one(s1)[0]
s2 = relabel_from_one(s2)[0]
s1 = relabel_sequential(s1)[0]
s2 = relabel_sequential(s2)[0]
j = (s2.max() + 1) * s1 + s2
j = relabel_from_one(j)[0]
j = relabel_sequential(j)[0]
return j