Commit Graph

88 Commits

Author SHA1 Message Date
Josh Warner 4644bdd347 Merge pull request #874 from emmanuelle/nlm_denoise
FEAT: NL-means denoising
2015-02-19 16:53:58 -06:00
emmanuelle 3eb775542f Added some comments inside Cython functions. 2015-02-10 23:22:42 +01:00
Steven Silvester 5ccdd36bc3 Remove imshow from PIL plugin
Do not provide imshow, show in PIL plugin to prevent conflicts

Make the sphinx install quiet

Fix local linka

Fix literal blocks

Fix another local link

Fix richardson-lucy link

Assert world dominance
2015-02-07 16:40:44 -06:00
emmanuelle 4c9dbe1e18 Added a comment about normalization. 2015-02-02 22:55:49 +01:00
emmanuelle 0f4b092578 Added comment for inner loops. 2015-02-01 23:31:09 +01:00
emmanuelle bcd24eab86 Removed a few redundant lines. 2015-02-01 23:11:34 +01:00
emmanuelle 6770e9e557 Modified name of image dtype. 2015-02-01 22:51:00 +01:00
emmanuelle 50907cd8e7 Modified variables' names. 2015-02-01 22:43:18 +01:00
emmanuelle ee81e00c0e Helper functions for computing the integral of the difference between
image and shifted image.
2015-02-01 22:30:00 +01:00
emmanuelle 4dbf33b9ca PEP 8: spaces and operators 2015-02-01 20:33:57 +01:00
emmanuelle 009e761411 [ENH] Docstring cleaning 2015-01-29 22:40:46 +01:00
emmanuelle 112b0b4fcd Global constant defined for distance cutoff 2015-01-29 21:36:08 +01:00
emmanuelle 4697d66c85 [ENH] Removed eps parameter that was not needed.
Added a test for the case when no denoising at all is performed when h is
very small.

Corrected a bug in looping range in the classical algorithm.
2015-01-26 22:06:38 +01:00
emmanuelle 2e0b37b11d Changed variable names for coordinates for better consistency with
skimage conventions. Moved some code to inline functions to improve
clarity.
2015-01-25 19:21:23 +01:00
emmanuelle e83873d563 Removed blank lines in docstring 2015-01-25 16:42:39 +01:00
emmanuelle 065bc18253 Merged 2D and 2D RGB functions for non-local means denoising 2015-01-25 16:40:07 +01:00
emmanuelle fa13744d59 Changed API of nl_means_denoising function to have a multichannel flag 2015-01-25 11:49:45 +01:00
emmanuelle ec6aa2a017 Added docstring to helper functions in cython submodule 2015-01-25 11:49:07 +01:00
Johannes Schönberger ee5c6fbeb2 Use relative imports in skimage files 2015-01-22 07:36:48 -05:00
Jonathan Helmus 738953b946 image_unwrapped created as ndarray always
In unwrap_phase the image_unwrapped variable is created as an
ndarray even when image is a masked array.
2015-01-21 19:37:23 -06:00
Jonathan Helmus 8eebb17bac No SegFault when unwrapping a 3D fully masked array
The unwrap_phase function no longer causes a Segmentation fault when passed
a 3D array in which all elements are masked.

Closes #1347
2015-01-21 16:45:23 -06:00
Jonathan Helmus d3024b5c73 No SegFault when unwrapping a 2D fully masked array
The unwrap_phase function no longer causes a Segmentation fault when passed
a 2D array in which all elements are masked.
2015-01-21 16:36:58 -06:00
Jonathan Helmus de01ea56ae unwrap_phase returns masked array when image is masked
With commit e3b84ed the unwrap_phase function would always return an ndarray
even when image was masked.  This restores the pre-e3b84ed behavior of
returning a masked array when the image is masked.
2015-01-21 16:23:50 -06:00
Jonathan Helmus eef3734bfe Remove end of line whitespace in test_unwrap.py 2015-01-21 16:03:18 -06:00
Jonathan Helmus 8ebe073ad5 BUG: unwrap_phase on compressed masked array
unwrap_phase works on masked arrays with a compressed mask (no elements masked)

Closes #1346
2015-01-21 16:01:13 -06:00
emmanuelle 60d0c81aed Changed type of error returned for image dimension strictly greater than 3. 2015-01-20 22:11:24 +01:00
emmanuelle dd9030d44c Implemented fast algorithm also for 3-D and 2D-RGB images. Changed API so
that there is only one function for fast and classic algorithms.
2015-01-18 22:18:29 +01:00
emmanuelle 8b9a777c79 Bug correction: I had forgotten to add __init__.py 2015-01-11 22:37:42 +01:00
emmanuelle c5e38dc5b1 Renamed module, since tests were breaking because module and function
had the same name.
2015-01-10 19:11:15 +01:00
emmanuelle ecaa959195 Implemented asymmetric distance computation to save speed factor of 2 2015-01-10 16:40:43 +01:00
emmanuelle 1d8e02bf38 Removed normalization of h parameters because float images will be
normalized anyway.
2015-01-10 12:15:26 +01:00
Steven Silvester f898bd0209 Style fixes 2014-12-26 11:26:30 -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 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 03be934e6d Set seed for test cases 2014-12-16 16:38:01 +01:00
Johannes Schönberger 3b0651c202 Expose seed parameter, fix doc string 2014-12-16 16:36:30 +01:00
Pratap Vardhan b72a960670 DOC: Misc spell corrections 2014-12-16 11:41:24 +05:30
Johannes Schönberger 1da86def59 Make the initialization deterministic 2014-12-16 00:54:32 +01:00
Johannes Schönberger 8a790bf884 Improve code style 2014-12-16 00:52:42 +01:00
Johannes Schönberger 3a1079a180 Misc PEP8 fixes 2014-12-14 02:56:14 +01:00
emmanuelle 873a2bab4f Modified a few docstrings that made doctesting fail 2014-12-07 16:58:36 +01:00
emmanuelle 4004f048ef Faster version of non-local means denoising for 2D greyscale images 2014-12-07 12:02:05 +01:00
emmanuelle e26f9028eb Modified import to be compatible with Python 3 2014-12-06 13:58:09 +01:00
emmanuelle 2e91b0db95 Moved non-local means denoising to restoration submodule 2014-12-06 13:16:40 +01:00
Stefan van der Walt 034a7adab3 Use equal_nulp for more robust test comparison 2014-11-07 16:04:54 +02:00
Rebecca 1b217f971e replacing lena in examples and most tests 2014-11-07 16:01:23 +02:00
Stefan van der Walt 8bba07a7f2 Merge pull request #1171 from jjhelmus/unwrap_phase_3d_bug
BUG: segmentation fault when unwrapping 3d image
2014-11-07 13:39:18 +02:00
Jonathan Helmus 25653dc288 TST: Unit test to check for 3d unwrap seg fault
Added a unit test to check for bug in unwrap_phase which causes
a segmentation fault when the middle dimension is connected.
2014-11-06 21:03:14 -06:00