Johannes Schönberger
a3313abd20
Merge pull request #1916 from blink1073/warn-stacklevel
...
Use a stacklevel of 2 by default for all warnings
2016-01-31 11:25:39 +01:00
Steven Silvester
4b2692b7c0
Cleanup
2016-01-30 15:56:19 -06:00
Steven Silvester
6170a7e532
Include the pyx files
2016-01-30 08:59:31 -06:00
Steven Silvester
b710bd21d2
Use a stacklevel of 2 by default for all warnings
2016-01-30 08:57:46 -06:00
Gregory R. Lee
b8e7740159
use dtype=np.float64 in calls to np.mean
2016-01-28 22:10:02 -05:00
Gregory R. Lee
8483a62e76
make suggested naming changes in simple_metrics.py
2016-01-28 22:09:52 -05:00
Gregory R. Lee
0f71278a10
revert simple_metrics to np.float64 computations for all input types
2016-01-27 12:36:22 -05:00
Gregory R. Lee
64f62032c3
psnr: update dynamic range calculation
...
also moved the identical dtype and shape checks into a separate utility function
2016-01-27 11:56:12 -05:00
Gregory R. Lee
ea3ad97b3e
TST: add MSE, NRMSE test that would fail in case of int overflow
2016-01-27 11:24:56 -05:00
Gregory R. Lee
acef026676
fixed outdated import name _simple_metrics in __init__.py
2016-01-26 18:21:12 -05:00
Gregory R. Lee
a8124166c1
Fix the default dynamic_range in PSNR and warn if inputs don't meet the assumptions made
2016-01-26 18:17:56 -05:00
Gregory R. Lee
f4773e303d
NRMSE, MSE, PSNR: make sure all inputs are float prior to the calculations.
2016-01-26 18:17:02 -05:00
Gregory R. Lee
a681ccd3ee
TST: add test for invalid normalization type in NRMSE
2016-01-26 17:56:38 -05:00
Gregory R. Lee
72607ca99e
update NRMSE docstrings and include run_module_suite in the corresponding test file
2016-01-24 12:41:18 -05:00
Gregory R. Lee
cfb9c760db
TST: fix broken test
2016-01-23 21:35:36 -05:00
Gregory R. Lee
69e73ea52b
TST: add tests for nrmse, psnr
2016-01-23 21:09:22 -05:00
Gregory R. Lee
ef3896d013
add new metrics to API
2016-01-23 21:09:22 -05:00
Gregory R. Lee and Gregory R. Lee
ee38b920d9
ENH: Add some simple image comparison metrics: PSNR and NRMSE
2016-01-23 21:09:21 -05:00
emmanuelle
6c9325aadf
Minor fixes: errant indent, functools.wraps and python3 style
2015-12-28 21:13:22 +01:00
emmanuelle
fab4265f47
Removed @property decorator, that made _install_properties_doc crash
2015-12-25 12:37:41 +01:00
emmanuelle
add3352284
Euler number is only2d
2015-12-25 11:38:23 +01:00
Juan Nunez-Iglesias and emmanuelle
9317b7be34
Make area a cached property; use np.sum
2015-12-24 19:02:15 +01:00
Juan Nunez-Iglesias and emmanuelle
d8cc148d8c
Replace individual errors by 2D decorator
2015-12-24 19:00:43 +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
d62524f103
Mentioned Euler characteristic (instead of Euler number) in docstring of
...
regionprops.
2015-12-23 16:26:23 +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
4aa08fe353
Simplify cache
2015-12-14 00:42:29 -08:00
Stefan van der Walt
bf5ba4540b
Fix doc setting for Python 2.x
2015-12-14 00:42:29 -08: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 (Mac)
443f4cc0eb
DOC: Correct docstring to correctly reflect defaults
2015-12-07 21:12:17 -07:00
Josh Warner
29725068ce
Guarantee correct mesh orientation from marching cubes
2015-12-06 00:28:18 -06:00
Josh Warner
6f016c9087
Merge pull request #1771 from noahtreb/fix-correct_mesh_orientation
...
FIX: Fix `correct_mesh_orientation` for spacing != (1,1,1)
2015-12-05 12:22:18 -06:00
Johannes Schönberger
50f2a0b4ed
Create helper function to compute norm along axis
2015-12-04 23:11:19 -05:00
Johannes Schönberger
f88694e5a3
Fix LineModelND test cases
2015-12-04 23:05:59 -05:00
Kevin Keraudren
0bdf4251c6
documentation updates; added "3D" to example title
2015-12-04 22:25:13 +00:00
Kevin Keraudren
6f9a55c987
added deprecation warning for LineModel and added note in TODO.txt
2015-12-04 08:48:08 +00: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
5bb206233d
fixed typo and added blank line
2015-12-01 15:18:57 +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
ba3c0c02cd
Fix circular import loop
2015-11-18 09:02:02 -05:00
stevendbrown
6638c92125
fixed error language
2015-11-17 08:16:58 -08:00
Johannes Schönberger
1278b02161
Fix circular import between regionprops and convex_hull_image
2015-11-17 10:19:09 -05:00
Johannes Schönberger
1a598be98e
Fix region props deprecation problem with label function
2015-11-17 10:07:29 -05:00
Johannes Schönberger