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
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
883dd24cdb
Fix bug when indexing into summed-area table.
2012-05-08 21:32:07 -04:00
2e8fcef89b
Simply equation in docstring of match_docstring.
2012-05-08 21:32:06 -04:00
cbdea0d36e
Add pad_output argmument to match_template.
2012-05-08 21:32:06 -04:00
3c7ae849b9
Remove unnecessary truncation at boundary.
2012-05-08 21:32:06 -04:00
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
8c816109c9
Remove OpenCV version of match_template
2012-05-08 21:32:06 -04:00
425a4ea707
Use feature.peak_local_max instead of custom peak detection.
2012-05-08 21:32:06 -04:00
9d3072d3f8
Fix type errors in match_template by casting inputs to float32.
2012-05-08 21:32:06 -04:00
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
e8461e22dd
Move template matching to feature subpackage
2012-05-08 21:32:05 -04:00
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
c3af26d37c
ENH: Add num_peaks to limit the number of peaks.
2012-04-16 00:19:56 -04:00
8bdc9f2ab4
Rename for clarity
...
"corner" is a relic from the original implementation in the harris filter.
2012-04-16 00:05:49 -04:00
0b33dd5811
Add docstring comment about flat peaks.
2012-04-16 00:02:45 -04:00
ae6ef22a69
Fix: return empty list for flat image.
2012-04-15 23:53:53 -04:00
2585a323ac
Change threshold test from >= to >.
2012-04-15 23:48:27 -04:00
187bc6d5b8
Deprecate threshold and replace absolute and relative thresholds.
2012-04-15 23:30:06 -04:00
b9b9cd5c65
Fix import
2012-04-15 23:15:18 -04:00
2aca8cd791
Addition of examples in the harris and peak local max function
2012-03-26 15:39:59 +02:00
8c9777b967
Addition of examples in the harris and peak local max function
2012-03-21 14:27:12 +01:00
e99f18be5a
BUG: Fix imports for Python 3.2.
2012-03-03 11:18:16 -08:00
c2cf8dba34
Fix invalid Python 3 syntax
2012-02-25 20:05:37 -08:00
0d697310dd
DOC finally....
2012-02-21 18:39:35 +01:00
2b6208cf3e
DOC some sphinx and rst fixes
2012-02-21 18:01:22 +01:00
a17f339b82
BUG: Fix import of harris.
2012-02-05 09:58:30 -08:00
96ba7eb4bd
Move harris corner detection from filter to feature subpackage.
2012-02-02 22:45:23 -05:00
1c9b340fe6
Rename peak_min_dist to peak_local_max.
2012-02-02 22:33:57 -05:00
8bb8d93552
Use ndimage.maximum_filter to simplify peak detection.
...
This change should give identitical results to the previous implementation.
2012-02-02 22:33:57 -05:00
83dc4a1d40
Refactor peak detection algorithm from Harris detector.
2012-02-02 22:33:57 -05:00
2f3da9cc8f
BUG: greycomatrix, one of the tests was failing for symmetric case
...
test_glcm.TestGLCM.test_output_symmetric_1 was failing on my computer.
I think this is because np.transpose returns a view when possible,
so P += np.transpose(P) must do weird things.
2011-12-08 21:53:31 +01:00
9133ab932c
Fix ImportError on Python 3
2011-12-03 15:46:41 -08:00
bf609dfca0
DOC: Fix some scikits.image mentions.
2011-12-02 10:55:41 -08:00
7df8486231
Update to docstring
2011-11-28 11:22:31 +00:00
7a191d8d20
Long lines, remove doctest, division by zero, data type ranges
2011-11-23 11:23:03 +00:00
67b408a3fc
BUG: Fixed warning suppression error
2011-11-22 11:55:40 +00:00
830c6b650b
ENH: Address division by zero errors
2011-11-22 11:48:51 +00:00
0597cec006
BUG: Fix typo and docstrng
2011-11-21 10:06:59 +00:00
ab780b1ecd
ENH: Updates based on review comments
2011-11-21 09:51:20 +00:00
1d540c2b56
BUG: Make sure image array is contiguous
2011-11-21 09:51:20 +00:00
80a83c182f
ENH: Use Cython to compute GLCM
2011-11-21 09:51:20 +00:00
59ff9218b4
DOC: Added latex formulas to docstring
2011-11-21 09:51:20 +00:00
1661015af1
ENH: Added a gallery example of GLCM textures
2011-11-21 09:51:20 +00:00
cd8524b93d
ENH: Compute some standard propertices for GLCMs
2011-11-21 09:51:20 +00:00
4fe7965f69
NF: Initial commit of greylevel co-occurance (pure python)
2011-11-21 09:51:20 +00:00
114cf44c77
Renamed scikits.image to skimage
2011-10-18 21:12:27 +02:00
Tony S Yu