Commit Graph

267 Commits

Author SHA1 Message Date
Juan Nunez-Iglesias 72125aac07 Add underscore for ReST reference 2015-01-19 09:03:30 +11:00
Juan Nunez-Iglesias 879a7b0bb5 Update treatment of convert2lab in slic
It still defaults to `True` but only when the last dimension of the
input array could be construed as RGB.

Also, update ValueError description in docstring.
2015-01-16 13:11:25 +11:00
Juan Nunez-Iglesias c102a0bf0e Add reference to SLIC0 in SLIC docstring 2015-01-16 12:08:13 +11:00
Steven Silvester f898bd0209 Style fixes 2014-12-26 11:26:30 -06:00
Steven Silvester d760c0adda Fix scipy.sparse.sparsetools warning 2014-12-24 11:20:52 -06:00
Steven Silvester bea57315fb Update docstring and fix pyamg warning check 2014-12-24 09:10:11 -06:00
Steven Silvester 23ae571689 Fix final failing test on Py2.6 build 2014-12-24 08:49:51 -06:00
Steven Silvester c0a0490eed Fix handling of multiple warnings and update tests
Fix handling of multiple warnings

Update all test __init__ files

Update segmentation pkg

Update the color pkg

Update the exposure pkg

Update the filters pkg

Update the io pkg

Update the measure pkg

Update morphology package

Restructure test setup function

Add expected_warnings to __all__

Update restoration pkg.

Remove explicit filter check since it is done elsewhere

Fix the image test helpers

Update the transform pkg

Fix util pkg

Update viewer pkg
2014-12-23 16:51:06 -06:00
Steven Silvester a4e4e57ba5 Create new expected_warnings helper and some cleanup
Add new helper function for expected warnings during test

Indentation cleanups and avoid skipping doctests if possible.
2014-12-23 16:50:18 -06:00
Steven Silvester 4680f30466 Add a test setup helper function
Add a function to set up a skimage test

Switch to new test helper function

Import local packages that raise warnings in test setup function

More fixes to doctests

Fix regionprops doc test

Try and fix the test_rank failure.

Remove no longer needed RectangleSelector shim

Skip more doctests in _regionprops

Try importing another scipy subpackage
2014-12-23 16:49:20 -06:00
Steven Silvester f72882fbd2 Import scipy before turning on warnings 2014-12-23 16:49:19 -06:00
Steven Silvester 0debedd82c Handle more warnings and reset io plugins as needed
Reset plugins prior to running collections test

Handle warnings in morphology pkg

Add __init__ for morpohology tests

Handle warnings for novice pkg

Handle warnings for restoration pkg

Handle warnings for segmentation pkg

Handle warnings for _shared pkg

Handle warnings for transform pkg

Handle warnings for util pkg

Handle warnings in viewer module
2014-12-23 16:48:16 -06:00
Johannes Schönberger 3a1079a180 Misc PEP8 fixes 2014-12-14 02:56:14 +01:00
Stefan van der Walt 78a7b7307a Rename and deprecate filter module to prevent shadowing of built-in keyword 2014-11-10 12:53:50 +02:00
Rebecca 1b217f971e replacing lena in examples and most tests 2014-11-07 16:01:23 +02:00
blink1073 caaf75ebd1 Fix failing doctests 2014-07-19 19:16:46 -05:00
blink1073 5677dafe41 Move away from random.random in favor of random.rand 2014-07-19 18:18:23 -05:00
Charles Harris 7a074d5dd1 BUG: Fix slicing error revealed by numpy 1.9.0.
Numpy 1.9.0 no longer allows oversize data to be assigned to a
boolean indexed 1-d array by discarding excess elements.

Closes #1050.
2014-07-04 20:12:46 -06:00
Johannes L. Schönberger 6546b9dba4 Merge pull request #1007 from stefanv/label_refactor
Move `morphology.label` to `measure.label` and prepare for 0-label transition
2014-05-25 21:56:42 -04:00
Josh Warner (Mac) 3fab7c0057 Remove incorrect np.round statement (directly cast m) 2014-05-08 18:54:52 -05:00
Stefan van der Walt 46829c6a33 Move implementation of label to measure submodule 2014-05-08 18:04:03 +02:00
Josh Warner (Mac) 26793068b1 Fix documentation, handle internal variable more efficiently. 2014-05-08 02:32:39 -05:00
Josh Warner (Mac) 069cba50ef FIX: Address non-int DeprecationWarning from NumPy 2014-05-07 23:54:17 -05:00
Josh Warner (Mac) 4aa162fc78 FIX: Remove unnecessary .transpose introduced in PR #984 2014-05-07 22:10:27 -05:00
Josh Warner (Mac) 0d775c3aab Remove check for non-numeric values in spacing. 2014-05-07 02:42:38 -05:00
Josh Warner (Mac) 0ac86b3e96 STY: More elegant and maintainable style per code review 2014-05-06 02:16:45 -05:00
Josh Warner (Mac) 88f08ebea2 TST: Add unit test for length-2 spacing with rank-2 input 2014-04-19 11:40:16 -05:00
Josh Warner (Mac) 7847287f46 FIX: Shortcut output or catch trivial cases in random_walker
Also:
* New tests to cover these new checks
* Improvements to docstrings and user warnings
* Generalize handling of `sampling` in accordance with docstring
* Some extra whitespace to improve readability
2014-04-18 18:47:20 -05:00
Josh Warner (Mac) 7161175e43 DOC: Clarify UMFPACK warning; use if statements instead of assert 2014-04-18 16:52:19 -05:00
Johannes Schönberger 44f3e1b136 Remove deprecated skimage.segmentation.visualize_boundaries 2014-04-11 10:05:51 -04:00
Juan Nunez-Iglesias 18ce9d2b95 Remove depth from random_walker tests 2014-04-09 23:44:34 +10:00
Juan Nunez-Iglesias 264ca6ebd9 Remove deprecated depth parameter in random_walker
This has been supplanted by the `spacing` parameter.
2014-04-09 23:41:37 +10:00
Juan Nunez-Iglesias 0af070b92f Change default mode cascade in random_walker seg 2014-04-09 23:35:42 +10:00
Juan Nunez-Iglesias dcd822bf48 Remove deprecated sigma default warning in SLIC 2014-04-09 17:57:06 +10:00
Juan Nunez-Iglesias 9510c03ce5 Remove deprecated ratio keyword in SLIC 2014-04-09 17:55:35 +10:00
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 15c2989158 Added deprecation warning 2014-01-17 16:52:44 +01: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 53a4388e26 Changed tests to begin segment label at 1 instead of 0 2013-12-23 14:44:23 +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