Commit Graph
22 Commits
Author SHA1 Message Date
Almar Klein 14288e1f1e PEP8 stuff. 2014-01-06 12:39:13 +01:00
Almar Klein 3cb5a19479 Update MCP: Put back the traceback() method.
I initially changed it to allow faster (flat) tracebacks *during*
front evolution, but it turned out not to be necessary. Putting back
to minimize the changes of this PR.
2014-01-03 15:09:06 +01:00
Almar Klein 9113d5a08b update-mcp: add tests for MCP_Flexible 2013-12-15 13:32:15 +01:00
Almar Klein fc90a164fe update-mcp: improvements to docstrings. 2013-12-15 12:44:53 +01:00
Almar Klein 789ade3ca2 update-mcp: added tests for newly added features.
Also fix in existing test related to how the traceback arrays is initialized:
first it was initialized with all -1, now with -2, and -1 at the seed points.
2013-12-15 00:37:27 +01:00
Almar Klein fdd880aa7f update-mcp: add new MCP classes to skimage.graph namespace 2013-12-14 23:58:45 +01:00
Almar Klein 2ebeee2df4 update-mcp: Change when examine_neighbors is called.
Also renamed Mcp_Connect to MCP_Connect.

Makes more sense to call it when the neighbor is frozen. In that
way the method is called exactly once for each pair of neighbours.
Plus the costs and paths are known and fixed.
2013-12-14 23:55:48 +01:00
Almar Klein f7416507fa update-mcp: Small fix.
Need _start and _end attributes for the MCP class.
It worked for my own tests because I overloaded the MCP class.
2013-12-13 16:37:36 +01:00
Almar Klein 32c4a80b32 update-mcp: Add MCP_Flexible subclass.
This class adds a public def-method for the private cdef-method hooks.
This allows users to influence the behavior of the MCP algorithm by
subclassing it in pure Python.
2013-12-13 15:13:24 +01:00
Almar Klein 8fe7416d41 update-mcp: Add MCP_Connect class
This class finds the connections between the given seed points. This is
a bit similar to finding connections between start and end points, except
now start- and endpoints are the same.
2013-12-13 15:13:24 +01:00
Almar Klein 798bea7251 update-mcp: Refactor MCP algorithm in prep for MCP subclasses
Installed a few hooks to allow more flexibility in subclasses, refactored
traceback() to allow obtaining tracebacks fast during front evolution, and
moved some initializations to reset().

Full list:
* integer division in calculating indices
* traceback_offsets use -2 for uninitialized, -1 for seed point. In that
  we we can distinguish between these two cases in traceback()
* Clearing of traceback_offset, cumulative_costs, pushing start positions
  into the heap, are now all done in reset()
* Reset is called every time that find_cost is called.
* Add hook _goal_reached()
* Add hook _examine_neighbor()
* Add hook _update_node()
* Replace while loop with a for-loop to prevent infinite looping in case of a bug.
* Split traceback() in two functions to allow getting a flat traceback fast.
  traceback() calles these two private functions and behaves as just before.
2013-12-13 15:13:24 +01:00
Almar Klein 280fadff39 MCP: refactored to use typed memoryviews
The arrays are stored on the mcp object, so that they can
be used in methods as well. Will use that to make MCP more
flexibel.
2013-12-13 15:13:24 +01:00
Almar Klein d1329488e6 MCP: add sampling attribute: deal with anisotropic data. 2013-12-13 15:13:24 +01:00
Almar Klein f5c675b8c6 MCP: turn while loop into for loop to prevent infinite looping.
A nice feature during development :)
2013-12-13 15:13:24 +01:00
Almar Klein 8d09300155 Improve speed of MPC by about 30%
Dear diary, I spend a whole day searching for why this implementation
of the MPC was slower then my own implementation. I checked *everything*.
I rewrote the front evolution to match with mine almost exactly. I was
about to give up. And then I saw this... Arg!
2013-12-13 15:13:24 +01:00
Almar Klein 4b2136bc7d Make mcp evolution algorithm a bit more readable.
In particular, distinguish between cost and cumcost, the same
variable name was used for this.
2013-12-13 15:13:24 +01:00
Almar 644ab324dd Added test for ball and octahedton selems.
Note that only the center slice (in each dimension is tested)
since there is no reference data available for these selems.
I did visualize the 3D shapes to see whether they look right.
2013-03-28 10:03:02 +01:00
Almar 77192b6e9a Adding octahedron selem (3D equivalent of diamond). 2013-03-28 09:48:25 +01:00
Almar fa6a30198c Fix typo in docstring of disk(). 2013-03-27 21:54:49 +01:00
Almar 42c72ab106 Add ball selem. I verified in 2D that this usage of np.mgrid yields the exact same results as np.meshgrid (np.meshgrid is not available for 3D). 2013-03-27 21:52:07 +01:00
Almar cbf1657ee7 Add cube selem. 2013-03-27 21:50:08 +01:00
Almar e9ce0f60b9 Create dummy WindowsError that is an actual Exception instead of None. The previous solution prevented installation on py3.3 and OSX 10.6.1. 2013-03-27 21:12:42 +01:00