Commit Graph

22 Commits

Author SHA1 Message Date
Johannes Schönberger f4f509fa8d Fix cython compilation warnings 2014-05-05 14:37:15 -04:00
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 fc90a164fe update-mcp: improvements to docstrings. 2013-12-15 12:44:53 +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 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
Josh Warner (Mac) 0eea2a48fe Fix Cython 0.19 build error due to global wraparound=False 2013-04-24 21:47:37 -05:00
Johannes Schönberger 62d83ad42c Globally change np to cnp if cimported 2013-02-24 14:14:14 +01:00
Tony S Yu 427a79fc6a STY: Clean up whitespace 2012-09-02 19:32:45 -04:00
Tony S Yu 27cac73e16 DOC: Fix section titles to match numpy doc standard 2012-09-02 18:33:38 -04:00
Zach Pincus 79972c3013 Indent 4 2012-06-07 08:55:35 -04:00
Zach Pincus ffff4a3077 BUG: MCP could segfault in places where both positive and negative moves would go out of bounds.
Previous assumption was that no location in the array would be one move from both upper and lower boundaries. This assumption is now removed.
2012-06-06 23:52:33 -04:00
Zach Pincus 4cf55a2702 Fix another 64-bit corner case
Fix a bug for particularly huge images that have strides > 2**31 in any
dimension.
2011-11-07 17:06:59 -05:00
Zach Pincus ea63e7d709 use 64-bit safe types 2011-11-07 15:51:39 -05:00
Nelle Varoquaux 114cf44c77 Renamed scikits.image to skimage 2011-10-18 21:12:27 +02:00