Commit Graph
139 Commits
Author SHA1 Message Date
emmanuelle add3352284 Euler number is only2d 2015-12-25 11:38:23 +01:00
emmanuelle 0359284623 Modified some methods in _RegionProperties class to make them
dimension-agnostic. Removed the NotImplementedError for 3-D images in
regionprops function.
2015-12-24 18:56:49 +01:00
emmanuelle e1751f91e2 Some PEP8 in test module 2015-12-24 18:52:57 +01:00
Emmanuelle Gouillart 4509338aac Merge pull request #1777 from stevendbrown/rp_intensity_check
Added label vs. intensity shape checking to regionprops
2015-12-23 22:34:59 +01:00
emmanuelle a56c6071c2 Corrected bug in the computation of the Euler characteristic. 2015-12-23 16:09:13 +01:00
Stefan van der Walt 024dd34b19 Clean up style and PEP8 2015-12-14 00:42:29 -08:00
Stefan van der Walt 5e848f5889 Auto-generate _RegionProps property docstrings 2015-12-14 00:42:29 -08:00
Juan Nunez-Iglesias 966e0fd685 Merge pull request #1770 from stefanv/list_regionprops
Only iterate over available region properties
2015-12-09 11:21:56 +11:00
Josh Warner 29725068ce Guarantee correct mesh orientation from marching cubes 2015-12-06 00:28:18 -06:00
Johannes Schönberger f88694e5a3 Fix LineModelND test cases 2015-12-04 23:05:59 -05:00
Kevin Keraudren 61b7c20e03 cleaned tests and documentation, added deprecation note in doc for LineModel. 2015-12-03 22:16:56 +00:00
Kevin Keraudren 6a2961fdee we now have the old LineModel with params (dist, theta), and the new LineModelND with params (origin, direction). 2015-12-03 22:03:10 +00:00
Kevin Keraudren 040a53456d Merged LineModel3D with LineModel in order to form a unified model.
- model.params holds the legacy params (2D representation),
 - model.new_params holds the true ND line representation.

The proposed LineModel behaves identically as the implementation in master in the 2D case. In the 3D case, it behaves similarly to the previously proposed LineModel3D, as long as new_params is used instead of params. This implementation thus takes advantage that the 2D case is a special case of the ND general model.
2015-12-02 08:58:16 +00:00
Kevin Keraudren c1c0d18ba1 reformatting code to wrap at 80 characters per line 2015-12-01 14:32:25 +00:00
Kevin Keraudren a606a53875 Adding LineModel3D for RANSAC, unit test and example. 2015-12-01 12:17:22 +00:00
Johannes Schönberger 1a598be98e Fix region props deprecation problem with label function 2015-11-17 10:07:29 -05:00
stevendbrown 157fef3963 Added label vs. intensity shape checking to regionprops 2015-11-09 10:50:20 -08:00
Stefan van der Walt ba68306997 Remove dict comprehension for Python 2.6 compatibility 2015-11-09 09:40:16 -08:00
Stefan van der Walt 52594d0bd8 Only iterate over available region properties 2015-11-05 15:41:00 -08:00
Johannes Schönberger ca5de50079 Enforce integral type for label images 2015-09-03 16:22:32 -04:00
Johannes Schönberger d4641a436a Improve documentation of moments functions 2015-08-19 14:11:39 -04:00
Stefan van der Walt 83d5ff9001 Consistently use relative imports 2015-07-11 15:41:37 -05:00
Gregory R. Lee ce8e88d6e2 remove truncate argument from gaussian_filter for scipy<0.14 compatibility 2015-05-19 11:16:19 -04:00
Gregory R. Lee c7916ffe9a remove image_similarity; set 11-tap Gaussian via truncate=3.5; add links to references 2015-05-15 21:35:47 -04:00
Gregory R. Lee 6317aac01e use scipy.ndimage.gaussian_filter instead of a custom implementation 2015-05-15 16:03:00 -04:00
Gregory R. Lee 9090aa6afb remove multichannel magic and default to False. fix bugs in tests introduced during rebase 2015-05-15 14:28:48 -04:00
Gregory R. Lee 86e07447d1 replace _discard_edges with skimage.util.arraypad.crop 2015-05-15 13:47:16 -04:00
Gregory R. Lee 3bf6cc106e add additional tests 2015-05-15 13:47:13 -04:00
Gregory R. Lee 6ba1596174 sample vs. population covariance difference addressed to more accurately match reference implementations 2015-05-15 13:45:38 -04:00
Gregory R. Lee 3b27107bfb structural_similarity: add image_content_weighting option 2015-05-15 13:42:29 -04:00
Gregory R. Lee b193e7990e structural_similarity: add option to return full ssim image in addition to the mean 2015-05-15 13:42:27 -04:00
Gregory R. Lee 44f1fd37f2 add multichannel support to structural_similarity 2015-05-15 13:42:14 -04:00
Gregory R. Lee 49a1060719 update structural similarity to nD implementation with gaussian weighting to match other reference implementations 2015-05-15 13:42:06 -04:00
Steven Silvester 0e61374a89 Add a helper function to check for low contrast
Add a helper function to check for low contrast

Add a check for low contrast when using imsave

Use the low contrast helper in imshow and make sure warnings are always shown

Clean up parameter names and add doctests

Remove unnecessary warning context

Remove unnecessary warning context

Add dtype ranges for 64bit types

Update tests with new warnings

Fix doctest logic

Fix doctest logic

Add a low contrast test with multiple dtypes

Fix check for color images

Fix color check again

Add support for int32 types

Relax assertion for 32bit builds

Add a low contrast test with multiple dtypes

Add a low contrast test with multiple dtypes

Fix check for color images

Fix color check again

Add support for int32 types
2015-03-09 21:34:58 -05:00
Johannes Schönberger 47a4418140 Use np.inf instead of float('inf') 2015-03-08 19:37:53 -04:00
Johannes Schönberger eb6c3ede38 Fix RANSAC for invalid model estimation and confidence corner case
Previously, estimators did not return whether the model estimation
was successful. RANSAC now tests whether the estimation was
successful and skips invalid models.

When the confidence/stop_probability of RANSAC was set to 1,
the iteration was falsely terminated early instead of running for
the maximum number of iterations.
2015-03-06 23:47:08 -05:00
Jonathan HelmusandSteven Silvester 78a0eb6b98 Implement appveyor builds
Implement Appveyor builds

initial test

Updated appveyor.yml

New nosetest call

With conda update conda

with pillow

without pillow

TST: Change case sensitivive JPG extension

Revert "TST: Change case sensitivive JPG extension"

This reverts commit 2deed7cc63736f7c6f0387bd37df4c6643c32847.

Trying with Python 2.7

Trying with version env

Trying again with variables

Testing on all Python versions

don't allow failures

Allow failure

Do not actually use tests

Ignore failing tests

Removed Python 2.6 test

Testing only Python 2.6

Testing out more sklearn like AppVeyor CI

Added install to pip

Add artifacts

Enabled all permutations

Disable 2.6, add PIL

Python 2.6, 2.7 only with PIL

Testing with variable dependencies

Allow failure with IF ELSE

With Python 3.4

Scikit-learn like appveyor CI

Fixing paths

Undo path fix

path fix single line

path fix single line 2

Using Miniconda

More path fixes

New wheelhouse link

Added pillow to requirements.txt

Added networkx to requirements.txt

Add testing of 32/64-bit Python 2.7 and 3.4 to matrix

Debugging Cython compile

Retry with all 4 builds

Updated install.ps1 file

Updated based on latest python-appveyor-demo

Debugging pip install

Specify numpy 1.8.1 until whl is uploaded to rackspace

Use skimage-wide requirements.txt file

Minor comment change to trigger build

Install wheel and then install from WHEELHOUSE

Install six from pip

Install networkx from pip

Install pyparsing from pip

Install pytz from pip

Try using just find-links

Install the binary dependencies first, then the rest

Add pillow to the install list

Fix appveyor.yml syntax

Fix requirements.txt syntax

Fix requirements.txt syntax again

Fix appveyor call to initial install

Fix appveyor call to initial install again

Fix appveyor call to initial install yet again

Install wheel

Install wheel first

Install wheel and nose in the appveyor requirements.txt

Fix Python3 version to match python ftp site

Only use cleanup decorator if available

Add debug info to multiimage test

More debugging information

Fix handling of path separators on Windows

Add another warning guard

Fix warning handling for non-windows

Do not use TkAgg as it may be causing alloc error

Clean up echo command

Allow for unclosed file warning

Fix spacing in echo command
2015-02-28 19:57:45 -06:00
Johannes Schönberger ad85dfabd5 Disable catch of all warnings, return nan params instead 2015-01-22 06:49:16 -05:00
Johannes Schönberger acf68c6d7c Add new parameter to catch exceptions during RANSAC 2015-01-21 14:10:09 -05: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 782ba46a4c Handle more warnings
Punt on the issue of warnings with the minimum build

Handle warnings in measure pkg

Fix the rank filter test by forcing a random seed in the function

Compare as boolean in imread test

Import loadmat in test_setup to avoid warning

Use a setup method for imread plugin test

Revoke unintended changes

Fix indentation to appease jni

More indentation fixes

Fix unintentional comment out
2014-12-23 16:49:59 -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 2756358f3c Clean up PIL plugin and handle more warnings
Use the pil plugin to load data files

Fix install_requires string formatting

Dead end commit

Make all tools executable

Remove debug print

Suppress PIL resourcewarnings

Handle a few more warnings
2014-12-23 16:48:38 -06:00
Johannes Schönberger 125d53ba52 Add test cases for invalid block sizes 2014-12-15 09:50:10 +01:00
Johannes Schönberger eba3d75fa9 Add sanity checks for input parameters 2014-09-28 18:43:32 -04:00
Johannes Schönberger be5d4b19ec Add stop_probability to RANSAC 2014-09-28 18:38:35 -04:00
Stefan van der Walt 5ba4b7ccd3 Expose point_in_poly and move to measure module 2014-09-22 17:56:18 +02:00
blink1073 5677dafe41 Move away from random.random in favor of random.rand 2014-07-19 18:18:23 -05:00
Johannes Schönberger 6a0d81a047 Remove backwards-compatability of skimage.measure.regionprops 2014-04-11 10:06:59 -04:00