From 802214d5acedc32507e9c1a041afdcb96c6963b0 Mon Sep 17 00:00:00 2001 From: Juan Nunez-Iglesias Date: Fri, 8 Jan 2016 22:11:31 +1100 Subject: [PATCH] Hold pixel count in mean boundary RAG edges This value is needed to combine edges when merging nodes. --- skimage/future/graph/rag.py | 2 ++ skimage/future/graph/tests/test_rag.py | 1 + 2 files changed, 3 insertions(+) diff --git a/skimage/future/graph/rag.py b/skimage/future/graph/rag.py index ab31171e..646a7cc6 100644 --- a/skimage/future/graph/rag.py +++ b/skimage/future/graph/rag.py @@ -406,6 +406,8 @@ def rag_boundary(labels, edge_map, connectivity=2): rag = RAG() rag.add_weighted_edges_from(_edge_generator_from_csr(graph_matrix), weight='weight') + rag.add_weighted_edges_from(_edge_generator_from_csr(count_matrix), + weight='count') for n in rag.nodes(): rag.node[n].update({'labels': [n]}) diff --git a/skimage/future/graph/tests/test_rag.py b/skimage/future/graph/tests/test_rag.py index 27d31a99..4b2e4cff 100644 --- a/skimage/future/graph/tests/test_rag.py +++ b/skimage/future/graph/tests/test_rag.py @@ -215,3 +215,4 @@ def test_rag_boundary(): assert set(g.edges()) == set([(1, 2), (1, 3), (2, 4), (3, 4)]) assert g[1][3]['weight'] == 0.25 assert g[2][4]['weight'] == 0.34375 + assert g[1][3]['count'] == 16