Commit Graph

8051 Commits

Author SHA1 Message Date
Josh Warner 8c08a4d468 Merge pull request #1798 from kevin-keraudren/seamcarving-typos
DOC: Fix typos in seam carving example
2015-12-05 11:49:53 -06:00
Josh Warner f25b46c9bb Merge pull request #1799 from ahojnnes/linemodelnd
FIX: Fix LineModelND test cases and linalg.norm axis error
2015-12-05 11:48:26 -06:00
Josh Warner e72908c6d9 Merge pull request #1800 from blink1073/fix-docs
DOC: Fix errant docstring reference
2015-12-05 11:29:42 -06:00
Steven Silvester 219d08ad7b Fix errant docstring 2015-12-05 10:35:11 -06:00
Kevin Keraudren 817b090c7c text improvement in seam carving example, added some newlines between plt.imshow() and """PLOT2RST""" 2015-12-05 14:23:23 +00: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 bed6f6069b small text improvement in seam carving example 2015-12-05 00:05:18 +00:00
Kevin Keraudren a0c5270e94 text improvement in seam carving example. 2015-12-04 23:54:52 +00:00
Kevin Keraudren e6c60ca890 fixed typos in seam carving example. 2015-12-04 23:10:53 +00:00
Josh Warner 07f18c6067 Merge pull request #1797 from ahojnnes/entr-ex
DOC: Improvements to entropy example
2015-12-04 17:09:12 -06:00
Johannes Schönberger 198ce0250b Merge pull request #1764 from glemaitre/geometric_mean
Geometric mean
2015-12-04 18:02:44 -05:00
Johannes Schönberger a1d162a4f9 Use more common syntax to assign axis variables 2015-12-04 18:00:38 -05:00
Johannes Schönberger 99484e3a77 Merge pull request #1795 from kevin-keraudren/ransac-linemodel3D
Adding LineModel3D for RANSAC, unit test and example.
2015-12-04 17:58:52 -05:00
Kevin Keraudren 0bdf4251c6 documentation updates; added "3D" to example title 2015-12-04 22:25:13 +00:00
Guillaume Lemaitre 0c1fc76f4b Update the reference 2015-12-04 19:27:44 +01:00
Guillaume Lemaitre 54043de4b4 Change the import of round function to be compatible with visual studio compiler 2015-12-04 19:26:38 +01:00
Guillaume Lemaitre 3a2acb2adf Update the documentation with spelling error 2015-12-04 19:26:37 +01:00
Guillaume Lemaitre 4bc1c587ed Add local geometric mean filter
Add the filter in cython with a specific kernnel.
The implementatio is based on the log-average method.
The test were added the npz.
2015-12-04 19:26:37 +01:00
Johannes Schönberger 0e38481ade Improvements to entropy example 2015-12-04 12:45:15 -05:00
Johannes Schönberger bc7e9588e9 Merge pull request #1676 from odebeir/sprint_add_entropy_example
add entropy example
2015-12-04 11:37:47 -05:00
Korijn van Golen c095daa234 Added unit test to check correct output of HOG on Lena grayscale image, and added feature_vector parameter to disable the .ravel() call on the result. 2015-12-04 10:42:12 +01:00
ivoflipse 2adab1560a Reapplying the changes that got reverted 2015-12-04 10:42:11 +01:00
ivoflipse 9048a20340 Fix an error in the centre calculation 2015-12-04 10:42:10 +01:00
ivoflipse 8b7920ea13 Fix an error in the centre calculation 2015-12-04 10:42:09 +01:00
ivoflipse c1722d8709 Moved range_rows_start/stop and range_colums_start/stop to hog_histograms
Divided the total by the size of the cell to normalize the result in cell_hog
2015-12-04 10:42:09 +01: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
Juan Nunez-Iglesias bf46532425 Merge pull request #1794 from kshitij10496/boundaries-bool
Support for boolean types #1645
2015-12-02 18:31:35 +11:00
Kshitij Saraogi 428db535cd added support for boolean types in segementation 2015-12-02 10:57:07 +05:30
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
Julius Bier Kirkegaard 320977c8b9 Fixed doctest problem 2015-12-01 12:42:12 +00:00
Kevin Keraudren a606a53875 Adding LineModel3D for RANSAC, unit test and example. 2015-12-01 12:17:22 +00:00
scottsievert 5aabc199aa uses fftconvolve instead of convolve2d 2015-11-30 23:25:44 -06:00
Julius Bier Kirekgaard ea33891c60 Skip doctest 2015-11-29 14:15:10 +00:00
Juan Nunez-Iglesias 3b525987f5 Merge pull request #1787 from ahojnnes/rpropsfix
Various fixes and improvements
2015-11-19 15:16:16 +11:00
Johannes Schönberger ba3c0c02cd Fix circular import loop 2015-11-18 09:02:02 -05:00
Johannes Schönberger 9d3a7b4ecd Remove redundant type conversion 2015-11-18 08:58:01 -05:00
Juan Nunez-Iglesias 015c57c307 Merge pull request #1689 from oew1v07/remove_small_holes
Remove small holes
2015-11-18 22:36:33 +11:00
stevendbrown 6638c92125 fixed error language 2015-11-17 08:16:58 -08:00
Johannes Schönberger a63b746e6c Move import test to top of function and import outside of function 2015-11-17 10:25:05 -05:00
Johannes Schönberger 6e644c4aa6 Remove single author from header, fix typo
Functions in this file are from multiple authors, the original
author is attributed in the contributors section and the Git history.
2015-11-17 10:22:44 -05: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 3437eb89b0 Fix deprecated filter module import 2015-11-17 10:09:42 -05:00
Johannes Schönberger 1a598be98e Fix region props deprecation problem with label function 2015-11-17 10:07:29 -05:00
Juan Nunez-Iglesias 0d1c7eac6c Merge pull request #1785 from pratapvardhan/colordir
MNT: Remove redundant return from gray2rgb
2015-11-16 19:53:58 +11:00
Pratap Vardhan bb3bd34686 TST: Aseert check values for older test_gray2rgb case 2015-11-16 12:49:27 +05:30