From fdd880aa7f8e3595dc281cf6aa0b4c3cbfdfaa8b Mon Sep 17 00:00:00 2001 From: Almar Klein Date: Sat, 14 Dec 2013 23:58:45 +0100 Subject: [PATCH] update-mcp: add new MCP classes to skimage.graph namespace --- skimage/graph/__init__.py | 4 +++- skimage/graph/mcp.py | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/skimage/graph/__init__.py b/skimage/graph/__init__.py index eb817c77..a335971d 100644 --- a/skimage/graph/__init__.py +++ b/skimage/graph/__init__.py @@ -1,7 +1,9 @@ from .spath import shortest_path -from .mcp import MCP, MCP_Geometric, route_through_array +from .mcp import MCP, MCP_Geometric, MCP_Connect, MCP_Flexible, route_through_array __all__ = ['shortest_path', 'MCP', 'MCP_Geometric', + 'MCP_Connect', + 'MCP_Flexible', 'route_through_array'] \ No newline at end of file diff --git a/skimage/graph/mcp.py b/skimage/graph/mcp.py index dc584226..bf693a45 100644 --- a/skimage/graph/mcp.py +++ b/skimage/graph/mcp.py @@ -1,4 +1,4 @@ -from ._mcp import MCP, MCP_Geometric +from ._mcp import MCP, MCP_Geometric, MCP_Connect, MCP_Flexible def route_through_array(array, start, end, fully_connected=True,