diff --git a/skimage/graph/graph_cut.py b/skimage/graph/graph_cut.py index 6cdd9f83..87fa79a8 100644 --- a/skimage/graph/graph_cut.py +++ b/skimage/graph/graph_cut.py @@ -2,7 +2,7 @@ import networkx as nx import numpy as np -def threshold_cut(label_image, rag, thresh): +def threshold_cut(labels, rag, thresh): """Combine regions seperated by weight less than threshold. Given an image's labels and its RAG, outputs new labels by @@ -11,7 +11,7 @@ def threshold_cut(label_image, rag, thresh): Parameters ---------- - label_image : (width, height) or (width, height, 3) ndarray + labels : (width, height) or (width, height, 3) ndarray The array of labels. rag : RAG The region adjacency graph. @@ -46,10 +46,10 @@ def threshold_cut(label_image, rag, thresh): comps = nx.connected_components(rag) - map_array = np.arange(label_image.max() + 1, dtype=np.int) + map_array = np.arange(labels.max() + 1, dtype=np.int) for i, nodes in enumerate(comps): for node in nodes: for label in rag.node[node]['labels']: map_array[label] = i - return map_array[label_image] + return map_array[labels] diff --git a/skimage/graph/rag.py b/skimage/graph/rag.py index 673e7ead..e42a5707 100644 --- a/skimage/graph/rag.py +++ b/skimage/graph/rag.py @@ -85,7 +85,7 @@ def _add_edge_filter(values, g): return 0.0 -def rag_meancolor(image, label_image, connectivity=2): +def rag_meancolor(image, labels, connectivity=2): """Compute the Region Adjacency Graph of a color image using difference in mean color of regions as edge weights. @@ -98,7 +98,7 @@ def rag_meancolor(image, label_image, connectivity=2): ---------- image : ndarray Input image. - label_image : ndarray + labels : ndarray The array with labels. This should have one dimention lesser than `image` connectivity : float, optional @@ -126,7 +126,7 @@ def rag_meancolor(image, label_image, connectivity=2): """ g = RAG() - fp = nd.generate_binary_structure(label_image.ndim, connectivity) + fp = nd.generate_binary_structure(labels.ndim, connectivity) for d in range(fp.ndim): fp = fp.swapaxes(0, d) fp[0, ...] = 0 @@ -136,20 +136,20 @@ def rag_meancolor(image, label_image, connectivity=2): # element in the array being passed to _add_edge_filter is # the central value. - for i in range(label_image.max() + 1): + for i in range(labels.max() + 1): g.add_node( i, {'labels': [i], 'pixel count': 0, 'total color': np.array([0, 0, 0], dtype=np.double)}) filters.generic_filter( - label_image, + labels, function=_add_edge_filter, footprint=fp, mode='nearest', extra_arguments=(g,)) - for index in np.ndindex(label_image.shape): - current = label_image[index] + for index in np.ndindex(labels.shape): + current = labels[index] g.node[current]['pixel count'] += 1 g.node[current]['total color'] += image[index]