2a930700d5
Fix ValueError: Buffer dtype mismatch, expected 'Py_ssize_t' but got 'long' on win-amd64
2014-03-10 20:51:43 -07:00
ee3ca829c6
Added a test for slic_zero and some other changes based on feedback from Github.
2014-01-26 18:01:59 +00:00
0c4adddf81
Some changes based on feedback from discussion on Github.
2014-01-22 19:25:18 +00:00
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
b4ac25200b
Bug fix: removed temporary debug code
2014-01-21 19:45:08 +00:00
0bd1d4490e
Added SLIC-zero to SLIC and changed SLIC implementation slightly
2014-01-21 19:45:08 +00:00
15c2989158
Added deprecation warning
2014-01-17 16:52:44 +01:00
f461d76004
Fixed minor documentation issues
2014-01-12 17:03:10 +00:00
4982b00f0c
Labels start at 0, for backward compatibility
...
Code is PEP8 compliant
2013-12-24 18:45:55 +01:00
9178e77aef
Changed variable names for readbility, fixed PEP8 compliance
2013-12-24 13:25:48 +01:00
a50b05eeb8
Fixing some code, minor revision
2013-12-24 12:00:21 +01:00
08dc3a33d0
Changed coding style to be compliant with PEP8
2013-12-24 11:35:21 +01:00
53a4388e26
Changed tests to begin segment label at 1 instead of 0
2013-12-23 14:44:23 +01:00
e68ab76b24
Added max_size as a parameter
2013-12-23 01:17:51 +01:00
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
8db9096b20
Enforce SLIC superpixels connectivity
2013-12-20 09:18:14 +01:00
4033566ae6
Add test for invalid parameter combination
2013-11-22 12:22:10 +01:00
e74db662cb
Add test case for *_boundaries functions
2013-11-21 23:58:39 +01:00
b4c190e560
Explicitly set sigma value to 0 to avoid warning
2013-11-12 08:27:14 +01:00
7f27d5bffb
Fix label2rgb bug
2013-11-09 22:04:28 +01:00
615866ae16
Cast label_field to integer dtype for float intput
2013-11-09 21:56:18 +01:00
96f04ad530
slight performance improvement.
2013-10-20 15:15:55 -07:00
57e37352cb
FIX add missing min_size parameter, add regression test.
2013-10-20 15:15:36 -07:00
eb4c5c9ee4
PEP8
2013-10-14 16:14:30 +02:00
961c47e801
DOC: Fix minor typo in docstring
2013-10-13 12:40:00 -05:00
927ba2cd8e
FIX: roll back incorrect testing change of gradient order
2013-10-13 12:39:13 -05:00
f25ca3a835
ENH: spacing kwarg for random_walker and improved tests
2013-10-13 12:39:13 -05:00
e5e1918a2b
REBASE: Resolve first conflict
2013-10-13 12:38:35 -05:00
dca255648f
Merge pull request #759 from jni/supress-umf
...
Suppress error message during failed UmfpackContext import.
2013-10-11 09:57:30 -07:00
bfaf89e2f3
Deprecate default mode 'bf' in random_walker
2013-10-08 13:23:50 +11:00
fb86bac350
Add comment and links explaining Umfpack import
2013-10-07 13:33:17 +11:00
248ac46dae
Remove unused imports in random_walker source
2013-10-07 13:25:13 +11:00
fc15f75f8d
Monkey-patch UmfpackContext __del__
...
By putting the failing statement in a try: except: clause, the
exception is caught and the error message is silenced.
See
https://groups.google.com/d/msg/scikit-image/FrM5IGP6wh4/1hp-FtVZmfcJ
and
http://stackoverflow.com/questions/13977970/ignore-exceptions-printed-to-stderr-in-del/13977992?noredirect=1#comment28386412_13977992
2013-10-05 14:27:51 +10:00
a15312e3c8
Only raise umfpack warning if cg mode is used
2013-10-04 15:21:50 +10:00
a9afb241cc
Rename deprecated relabel_from_one in docstring example
2013-10-03 16:23:30 +10:00
a8488bfecd
Remove deprecated use of relabel_from_one
2013-10-03 16:14:30 +10:00
bfab493133
Add new tests for relabel_sequential
2013-10-03 16:11:52 +10:00
37f66f769b
Add relabel_sequential to __init__ import
2013-10-03 16:09:27 +10:00
1843829917
Add relabel_sequential, deprecate relabel_from_one
2013-10-03 16:08:29 +10:00
628d484942
DOC: no import numpy in doc
2013-10-02 18:14:21 +02:00
4ab166bba4
Merge pull request #726 from jni/fix-relabel-doc
...
Fix errors in relabel_from_one docs; PEP8
2013-09-29 16:03:56 -07:00
8fb6fd02a0
Scale sigma only in scalar case
2013-09-26 16:52:58 +02:00
845d083470
Define 1d arrays as contiguous
2013-09-22 07:22:09 +02:00
54530d16f6
Update snippets in notes to use double backticks
2013-09-22 13:37:04 +10:00
e17e7699b3
Add note about (z, y, x) order in slic cython doc
2013-09-21 00:12:12 +10:00
05fbc3fbfc
Bug fix: typo: wrote spacing instead of sigma
2013-09-16 22:42:48 +10:00
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
846765e5f9
Add spacing support for new, speeded-up SLIC
2013-09-16 17:52:25 +10:00
610a0d1793
Add support for list sigma input in SLIC
...
Previously, having a different `sigma` for different dimensions
required an array input. This allows the user to use a simple list,
which gets converted to an array internally.
Importantly, it removes a very unhelpful error:
```python
>>> im = np.random.rand(10, 20)
>>> from skimage import segmentation as seg
Exception AttributeError: "'UmfpackContext' object has no attribute '_symbolic'" in <bound method UmfpackContext.__del__ of <scipy.sparse.linalg.dsolve.umfpack.umfpack.UmfpackContext object at 0x1045ff5d0>> ignored
>>> s = seg.slic(im, 2, sigma=[2, 1])
---------------------------------------------------------------------------
AttributeError Traceback (most recent call last)
<ipython-input-3-689b36a2f0ef> in <module>()
----> 1 s = seg.slic(im, 2, sigma=[2, 1])
/Users/nuneziglesiasj/venv/skimdev2/lib/python2.7/site-packages/scikit_image-0.9dev-py2.7-macosx-10.5-x86_64.egg/skimage/segmentation/slic_superpixels.pyc in slic(image, n_segments, compactness, max_iter, sigma, multichannel, convert2lab, ratio)
106 if not isinstance(sigma, coll.Iterable):
107 sigma = np.array([sigma, sigma, sigma])
--> 108 if (sigma > 0).any():
109 sigma = list(sigma) + [0]
110 image = ndimage.gaussian_filter(image, sigma)
AttributeError: 'bool' object has no attribute 'any'
```
2013-09-16 17:49:07 +10:00
9d86c9a1e1
Ignore convert2lab keyword if not multichannel
2013-09-16 17:33:08 +10:00
cgohlke