Commit Graph

55 Commits

Author SHA1 Message Date
cgohlke 2a930700d5 Fix ValueError: Buffer dtype mismatch, expected 'Py_ssize_t' but got 'long' on win-amd64 2014-03-10 20:51:43 -07:00
Michal Romaniuk ee3ca829c6 Added a test for slic_zero and some other changes based on feedback from Github. 2014-01-26 18:01:59 +00:00
Michal Romaniuk 0c4adddf81 Some changes based on feedback from discussion on Github. 2014-01-22 19:25:18 +00:00
Michal Romaniuk 131dea07a0 Merged the separate loops for SLIC-zero and SLIC into one, and some minor improvements based on feedback on Github. 2014-01-21 20:08:07 +00:00
Michal Romaniuk b4ac25200b Bug fix: removed temporary debug code 2014-01-21 19:45:08 +00:00
Michal Romaniuk 0bd1d4490e Added SLIC-zero to SLIC and changed SLIC implementation slightly 2014-01-21 19:45:08 +00:00
Guillem Palou Visa f461d76004 Fixed minor documentation issues 2014-01-12 17:03:10 +00:00
Guillem Palou Visa 4982b00f0c Labels start at 0, for backward compatibility
Code is PEP8 compliant
2013-12-24 18:45:55 +01:00
Guillem Palou Visa 9178e77aef Changed variable names for readbility, fixed PEP8 compliance 2013-12-24 13:25:48 +01:00
Guillem Palou Visa a50b05eeb8 Fixing some code, minor revision 2013-12-24 12:00:21 +01:00
Guillem Palou Visa 08dc3a33d0 Changed coding style to be compliant with PEP8 2013-12-24 11:35:21 +01:00
Guillem Palou e68ab76b24 Added max_size as a parameter 2013-12-23 01:17:51 +01:00
Guillem Palou 0d6540a82c Changed SLIC superpixels so that connectivity is enforced optionally.
A separate, private function is created that implements the postprocessing step
2013-12-23 00:49:06 +01:00
Guillem Palou 8db9096b20 Enforce SLIC superpixels connectivity 2013-12-20 09:18:14 +01:00
Johannes Schönberger 845d083470 Define 1d arrays as contiguous 2013-09-22 07:22:09 +02:00
Juan Nunez-Iglesias e17e7699b3 Add note about (z, y, x) order in slic cython doc 2013-09-21 00:12:12 +10:00
Juan Nunez-Iglesias 00e5ff263b Add spacing descriptions; use np.double
Implement @ahojnnes's comments on pull request. Use `np.double` as
dtype for arrays because in Cython, `float` is not `np.double`. And
add further clarification about the `spacing` parameter.
2013-09-16 21:26:44 +10:00
Juan Nunez-Iglesias 846765e5f9 Add spacing support for new, speeded-up SLIC 2013-09-16 17:52:25 +10:00
Johannes Schönberger 22ca0ae457 Fix indentation 2013-09-03 20:31:24 +02:00
Johannes Schönberger 770e28d2bb Rename clusters to segments 2013-09-03 10:47:49 +02:00
Johannes Schönberger f5cfbcfe97 Reorder variable declarations 2013-09-01 16:46:01 +02:00
Johannes Schönberger bd388383a0 Fix bug in window extent determination 2013-09-01 16:46:01 +02:00
Johannes Schönberger bc7efb01e4 Fix dtype bug 2013-09-01 16:46:01 +02:00
Johannes Schönberger 84579a6c2c Remove legacy comment 2013-09-01 16:46:01 +02:00
Johannes Schönberger 471b293a9e Remove unnecessary parameters and update doc string 2013-09-01 16:46:00 +02:00
Johannes Schönberger 6b5556b279 Reduce memory footprint 2013-09-01 16:46:00 +02:00
Johannes Schönberger fd729a4e30 Improve SLIC 2013-09-01 16:46:00 +02:00
Johannes Schönberger c8f619e384 Use typed memoryviews in transform package 2013-08-19 19:22:28 +02:00
Juan Nunez-Iglesias 4edf227869 Change 'long' to 'int' in Cython docs 2013-08-10 11:17:18 +10:00
Juan Nunez-Iglesias fe02c18f3d Use Py_ssize_t instead of int in _slic_cython 2013-08-09 18:43:24 +10:00
Juan Nunez-Iglesias 3e99079107 Precision issues appear to have vanished 2013-07-25 00:24:04 +10:00
Juan Nunez-Iglesias af3ea5f817 Remove unused 'ratio' argument from _slic_cython 2013-07-25 00:23:01 +10:00
Juan Nunez-Iglesias df2233cc6a Remove old commented-out code 2013-07-03 00:49:36 +02:00
Juan Nunez-Iglesias cd197527fb Speed up initialising 'distance' in SLIC 2013-07-02 13:22:14 +02:00
Juan Nunez-Iglesias 578876eff8 Bug fix: correctly initialize distance in slic 2013-07-02 13:22:14 +02:00
Juan Nunez-Iglesias a338618967 Remove diagnostic print 2013-07-02 13:22:14 +02:00
Juan Nunez-Iglesias 524255c0a2 Improve _slic.pyx doc, bug fixes, debug print 2013-07-02 13:22:14 +02:00
Juan Nunez-Iglesias 6e64515ea9 Fix build errors with memoryviews 2013-07-02 13:22:14 +02:00
Juan Nunez-Iglesias b1b70631bd Initial attempt at updating SLIC for memoryviews 2013-07-02 13:22:14 +02:00
Juan Nunez-Iglesias 8e4ab32ed9 Bug fixes: concatenation order and shape assignments 2013-07-02 13:22:13 +02:00
Juan Nunez-Iglesias 6dc8e6300b Separate inner loop of SLIC computation 2013-07-02 13:22:12 +02:00
Juan Nunez-Iglesias 620210025f Modify SLIC to allow uneven step sizes 2013-07-02 13:22:12 +02:00
Juan Nunez-Iglesias a2e32cc90c Add initial 3D modifications (not working) 2013-07-02 13:21:17 +02:00
François Boulogne a48de8dea9 add optional + default in pyx docstring 2013-05-29 20:18:19 +02:00
Johannes Schönberger 62d83ad42c Globally change np to cnp if cimported 2013-02-24 14:14:14 +01:00
Johannes Schönberger 7e578b5dec Fix index type error in SLIC function 2013-02-22 17:05:39 +01:00
Johannes Schönberger 614023b941 Replace ssize_t with Py_ssize_t globally 2013-02-22 17:05:38 +01:00
Johannes Schönberger 9f55fa2112 Change type to ssize_t for all index and size variables 2013-02-22 17:05:10 +01:00
Juan Nunez-Iglesias 35e8ad2ccc Allow grayscale input images to SLIC segmentation
There is no reason for SLIC to be restricted to colour/RGB images. I
have added a few lines that allow single-channel input.
2012-12-17 16:45:23 +11:00
Emmanuelle Gouillart b1098f69f8 DOC: removed unused import in docstring 2012-09-02 23:21:13 +02:00