From e5fe82d6f32f75f03b2de7c24c667b345862f4a8 Mon Sep 17 00:00:00 2001 From: Juan Nunez-Iglesias Date: Tue, 3 Feb 2015 16:20:15 +1100 Subject: [PATCH] Fix even more tests still importing skimage.graph --- skimage/future/graph/graph_cut.py | 6 ++++-- skimage/future/graph/rag.py | 3 ++- skimage/future/graph/tests/test_rag.py | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/skimage/future/graph/graph_cut.py b/skimage/future/graph/graph_cut.py index b4658bd1..d727eeac 100644 --- a/skimage/future/graph/graph_cut.py +++ b/skimage/future/graph/graph_cut.py @@ -37,7 +37,8 @@ def cut_threshold(labels, rag, thresh, in_place=True): Examples -------- - >>> from skimage import data, graph, segmentation + >>> from skimage import data, segmentation + >>> from skimage.future import graph >>> img = data.astronaut() >>> labels = segmentation.slic(img) >>> rag = graph.rag_mean_color(img, labels) @@ -107,7 +108,8 @@ def cut_normalized(labels, rag, thresh=0.001, num_cuts=10, in_place=True, Examples -------- - >>> from skimage import data, graph, segmentation + >>> from skimage import data, segmentation + >>> from skimage.future import graph >>> img = data.astronaut() >>> labels = segmentation.slic(img, compactness=30, n_segments=400) >>> rag = graph.rag_mean_color(img, labels, mode='similarity') diff --git a/skimage/future/graph/rag.py b/skimage/future/graph/rag.py index 9e882bae..b0fd9240 100644 --- a/skimage/future/graph/rag.py +++ b/skimage/future/graph/rag.py @@ -365,7 +365,8 @@ def draw_rag(labels, rag, img, border_color=None, node_color='#ffff00', Examples -------- - >>> from skimage import data, graph, segmentation + >>> from skimage import data, segmentation + >>> from skimage.future import graph >>> img = data.coffee() >>> labels = segmentation.slic(img) >>> g = graph.rag_mean_color(img, labels) diff --git a/skimage/future/graph/tests/test_rag.py b/skimage/future/graph/tests/test_rag.py index cfa49cdf..1cac2b2d 100644 --- a/skimage/future/graph/tests/test_rag.py +++ b/skimage/future/graph/tests/test_rag.py @@ -1,5 +1,5 @@ import numpy as np -from skimage import graph +from skimage.future import graph from skimage._shared.version_requirements import is_installed from numpy.testing.decorators import skipif from skimage import segmentation