Commit Graph

70 Commits

Author SHA1 Message Date
Stefan van der Walt 90e61e22ae Merge pull request #240 from tonysyu/rename-duplicates
BUG: Rename modules with duplicate function names.
2012-08-16 23:01:48 -07:00
Tony S Yu 1ea41173b8 BUG: Rename files with similar function, python module, and cython extension names. 2012-08-16 22:42:27 -04:00
Johannes Schönberger bb27e37710 extend test cases for num_peaks parameter of peak_local_max 2012-08-14 07:59:54 +02:00
Johannes Schönberger a87779b650 fix num_peaks parameter bug in peak_local_max 2012-08-10 20:45:50 +02:00
Tony S Yu 8a340cc47d BUG: more module renaming to prevent duplicates. 2012-08-02 23:08:19 -04:00
Brian Holt f3024fc4cd simplified hog code + extra unit test 2012-07-24 10:52:55 +01:00
Andreas Mueller f7c56202d0 COSMIT no spaces around power `**`. Fun: https://gist.github.com/1671995 2012-06-29 11:27:23 +02:00
Andreas Mueller f7b3d8062c COSMIT pep8 2012-06-29 11:27:23 +02:00
tangofoxtrotmike 4d999c313f feature.hog(): use y,x coords consistently, now works on non-square images 2012-05-22 17:35:11 +10:00
Stefan van der Walt fc676d6ae0 BUG: Correctly import _feature in Python 3. 2012-05-09 15:42:04 -07:00
Tony S Yu 7326b1949f BUG: fix test images (float images between 0 and 1). 2012-05-09 18:35:38 -04: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 a2f91585ef Add test for pad_input = True. 2012-05-08 21:32:08 -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 ad99285bc0 Prevent match_template from returning NaNs. 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 b2006da346 Change flipud/fliplr to array indexing. 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 5d79537566 Fix convolution input to get correlation results. 2012-05-08 21:32:07 -04:00
Tony S Yu 7caf85a5c1 Renaming for clarity. 2012-05-08 21:32:07 -04:00
Tony S Yu f21f032bfe Add normalization test and remove unnecessary clipping. 2012-05-08 21:32:07 -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 753e999a7a Minor cleanup
* Rename some variables.
* Delete some old comments.
* Move some variable initializations to the top of the function.
2012-05-08 21:32:07 -04:00
Tony S Yu 883dd24cdb Fix bug when indexing into summed-area table. 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 3c7ae849b9 Remove unnecessary truncation at boundary. 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 425a4ea707 Use feature.peak_local_max instead of custom peak detection. 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 2a00e24b12 Change _template.match_template variables to float.
Template and image in test are converted to float32 before passing to `match_template`. This change is temporary: `match_template` should convert these variables internally.
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
Tony S Yu a0c3e49742 Merge pull request #166 from 'vincent-albufera/exemple_modif'
DOC: Improve harris corners and peak detection examples and docstrings.
2012-04-25 00:52:53 -04:00
Tony S Yu c3af26d37c ENH: Add num_peaks to limit the number of peaks. 2012-04-16 00:19:56 -04:00
Tony S Yu 8bdc9f2ab4 Rename for clarity
"corner" is a relic from the original implementation in the harris filter.
2012-04-16 00:05:49 -04:00
Tony S Yu 0b33dd5811 Add docstring comment about flat peaks. 2012-04-16 00:02:45 -04:00
Tony S Yu ae6ef22a69 Fix: return empty list for flat image. 2012-04-15 23:53:53 -04:00
Tony S Yu 2585a323ac Change threshold test from >= to >. 2012-04-15 23:48:27 -04:00
Tony S Yu 187bc6d5b8 Deprecate threshold and replace absolute and relative thresholds. 2012-04-15 23:30:06 -04:00
Tony S Yu b9b9cd5c65 Fix import 2012-04-15 23:15:18 -04:00
Vincent Albufera 2aca8cd791 Addition of examples in the harris and peak local max function 2012-03-26 15:39:59 +02:00
Vincent Albufera 8c9777b967 Addition of examples in the harris and peak local max function 2012-03-21 14:27:12 +01:00
Stefan van der Walt e99f18be5a BUG: Fix imports for Python 3.2. 2012-03-03 11:18:16 -08:00
cgohlke c2cf8dba34 Fix invalid Python 3 syntax 2012-02-25 20:05:37 -08:00
Andreas Mueller 0d697310dd DOC finally.... 2012-02-21 18:39:35 +01:00
Andreas Mueller 2b6208cf3e DOC some sphinx and rst fixes 2012-02-21 18:01:22 +01:00
Stefan van der Walt a17f339b82 BUG: Fix import of harris. 2012-02-05 09:58:30 -08:00