Commit Graph

39 Commits

Author SHA1 Message Date
Johannes Schönberger ee5c6fbeb2 Use relative imports in skimage files 2015-01-22 07:36:48 -05:00
Johannes Schönberger 3a1079a180 Misc PEP8 fixes 2014-12-14 02:56:14 +01:00
Steven Silvester 2a057f7246 Make ndim explicit arg for clarity and update docstring 2014-09-21 05:48:58 -05:00
Steven Silvester 04f91021a9 Fix assert_nD call in template.py 2014-09-20 20:09:26 -05:00
Steven Silvester 6a05edb9ea Fix syntax error and weiner check 2014-09-20 19:50:37 -05:00
Steven Silvester 028fe11515 Use assert_nD in template.py 2014-09-20 17:13:57 -05:00
Johannes Schönberger bc8c11933f Fix input test of template matching 2014-01-13 06:50:19 -05:00
Johannes Schönberger 7b098ce35d Fix and improve doc string 2013-12-11 06:48:05 +01:00
Johannes Schönberger b815b5d045 Refactor final slicing 2013-12-10 09:19:47 +01:00
Johannes Schönberger 598ee3f9ec Improve description of match_template 2013-12-10 09:19:17 +01:00
Johannes Schönberger 48334705c1 Fix ndim test 2013-12-09 11:44:26 +01:00
Johannes Schönberger 914b8cbfe5 Re-order input checks 2013-12-09 08:21:22 +01:00
Johannes Schönberger e1033e3f8a Add missing bracket in doc tests 2013-12-09 08:06:16 +01:00
Johannes Schönberger 8ae8548dfd Avoid temporary array allocations 2013-12-09 07:52:08 +01:00
Johannes Schönberger d8b343e430 Fix doc tests 2013-12-09 01:00:32 +01:00
Johannes Schönberger baa0b2cfbf Add tests for 3-D template matching 2013-12-09 00:42:20 +01:00
Johannes Schönberger 8443c8469c Reuse 2D sum in 3D sum 2013-12-09 00:33:01 +01:00
Johannes Schönberger 84e03ec48b Add support for 3-D template matching 2013-12-09 00:31:51 +01:00
Johannes Schönberger 2e9e6a4ce3 Fix doctests 2013-12-09 00:04:54 +01:00
Johannes Schönberger 783c04baec Fix bug in array padding, template matching 2013-12-08 18:54:02 +01:00
Raphael Ackermann 0c81e14bfa changing docstring to make clear that only 2-D images are currently supported 2013-12-01 23:11:33 +01:00
François Boulogne eb9de1d7eb MIN: use print() instead of print 2013-06-12 21:16:23 +02:00
Andreas Mueller 6c59e04714 MISC remove unused imports, some pep8 corrections. 2012-09-27 20:01:45 +01:00
Johannes Schönberger 76f75c8ab6 Fix C-contiguous array bug in match template 2012-08-25 22:46:45 +02:00
Andreas Mueller f7b3d8062c COSMIT pep8 2012-06-29 11:27:23 +02:00
Stefan van der Walt fc676d6ae0 BUG: Correctly import _feature in Python 3. 2012-05-09 15:42:04 -07:00
Stefan van der Walt d19d45850f BUG: Fix internal import in template matching. 2012-05-09 12:53:29 -07:00
Tony S Yu 06bd3ebd6f Add doctest example to match_template. 2012-05-08 21:32:09 -04:00
Tony S Yu 193d5abd3c Rename pad_output parameter to pad_input. 2012-05-08 21:32:08 -04:00
Tony S Yu 383ca6220a Set match_template to default to no padding and fix test. 2012-05-08 21:32:08 -04:00
Tony S Yu 0c1e3541b3 Check that image is larger than template. 2012-05-08 21:32:08 -04:00
Tony S Yu 43ed4b9fb7 Pad input image instead of output. 2012-05-08 21:32:08 -04:00
Tony S Yu 5682d27eb0 Rewrite normalization algorithm.
This is a major revision that removes the `method` parameter of `match_template` and uses a new normalization method.

Note that the example result is different with this new normalization.
2012-05-08 21:32:07 -04:00
Tony S Yu 2e8fcef89b Simply equation in docstring of match_docstring. 2012-05-08 21:32:06 -04:00
Tony S Yu cbdea0d36e Add pad_output argmument to match_template. 2012-05-08 21:32:06 -04:00
Tony S Yu 545bdab985 Refactor template matching.
* Change Cython function to take names of correlation method instead of numbers representing the methods.

* Use alternate formula for `template_norm` of 'norm-corr' method, but note that both formulas need to be checked for correctness.

* Add note that `match_template` output has a different shape than the input image. This needs to be fixed before merging.

* Change 'Sigma' to 'Sum' in docstring to avoid confusion with standard deviation.

* Other minor changes for readability.
2012-05-08 21:32:06 -04:00
Tony S Yu 8c816109c9 Remove OpenCV version of match_template 2012-05-08 21:32:06 -04:00
Tony S Yu 9d3072d3f8 Fix type errors in match_template by casting inputs to float32. 2012-05-08 21:32:06 -04:00
Tony S Yu e8461e22dd Move template matching to feature subpackage 2012-05-08 21:32:05 -04:00