Commit Graph

663 Commits

Author SHA1 Message Date
Emmanuelle Gouillart d6105a0fe4 Merge pull request #1782 from pratapvardhan/clncython
BUG: Buffer dtype mismatch, expected 'Py_ssize_t' but got 'long'
2015-12-23 15:35:05 +01:00
Emmanuelle Gouillart f0eec46e5c Merge pull request #1783 from ivoflipse/fix_hog
Fixing Cythonized version of HOG
2015-12-19 17:37:24 +01:00
Steven Silvester 219d08ad7b Fix errant docstring 2015-12-05 10:35:11 -06: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
Pratap Vardhan ff082d283c BUG: Buffer dtype mismatch, expected 'Py_ssize_t' but got 'long' 2015-11-11 20:00:54 +05:30
Victor Escorcia 7254c1e7b2 Fix output type of peak_local_max 2015-10-03 22:12:03 +03:00
Robin Wilson 5cf7a2013d Fixed tests to use assertRaises as a function not a context manager 2015-08-30 22:49:24 +01:00
Robin Wilson 98bf488241 Fixed indentation 2015-08-29 23:26:22 +01:00
Robin Wilson 9f878affbc Renamed keyword arg to use_quantiles 2015-08-29 16:25:42 +01:00
Robin Wilson f9887e61e5 Added test for invalid quantile inputs 2015-08-29 14:14:13 +01:00
Robin Wilson 5f0665c99b Raise ValueError if quantile thresholds outside of [0, 1] - and updated docs 2015-08-29 13:46:56 +01:00
Robin Wilson b29ad8ef6d Added quantile_threshold option to canny edge detection
This allows you to specify the high and low thresholds as quantiles of the edge magnitude
image, rather than as absolute edge magnitude values
2015-08-28 22:30:42 +01:00
Steven Silvester 09c8a84a54 Merge pull request #1518 from stefanv/relative_imports
Consistently use relative imports
2015-07-12 14:41:06 -05:00
Jonathan Helmus 89a717ef3f TST: Reduced size of image in test_blob:test_blob_log for speed 2015-07-11 16:40:32 -05:00
Jonathan Helmus 9c6ab1bc18 TST: Use quarter size images to speed up test_censure unit tests 2015-07-11 16:28:58 -05:00
Stefan van der Walt 83d5ff9001 Consistently use relative imports 2015-07-11 15:41:37 -05:00
Josh Warner 3ce57f244b Merge pull request #1576 from belltailjp/fix-broken-link-to-daisy-implementation
DOC: Fix broken hyperlink to daisy code
2015-07-04 11:38:37 -05:00
Josh Warner 17a1121e42 Merge pull request #595 from TimSC/fasthog
ENH: Fast, Cython based hog implementation
2015-07-04 10:49:56 -05:00
Daichi SUZUO 55f798109c Fix a broken link to daisy code 2015-07-04 18:39:02 +09:00
Ivo Flipse cd30e010d5 Also added a nogil context manager to hoghistograms 2015-06-19 16:01:52 +02:00
Ivo Flipse 691beaa59f Adding nogil to cell_hog 2015-06-19 15:49:48 +02:00
Ivo Flipse 51e683f665 I hadn't realized I was reusing cc in the loop, so it would crash after one iteration.
And I had changed the second orientation, which probably wasn't correct
2015-06-19 08:51:54 +02:00
Ivo Flipse 167c8eeeb6 I hadn't realized when I changed orientations to an array, that its actually just an int and the original code said range(orientations), so I changed it to np.arange(orientations). Hopefully the tests will now pass again 2015-06-18 22:08:34 +02:00
Ivo Flipse 2500c21b12 Converted orientation and magnitude to typed memory view. Also changed gradient_columns and gradient_rows, hopefully in the right way. 2015-06-18 22:07:28 +02:00
Ivo Flipse 3d85503472 Renamed x to rows and y to columns, though I might have still missed it in some spots.
Indented the long if statements and put continue on a new line
Precomputed the range start and stop values
Defined additional variables
2015-06-18 22:03:21 +02:00
Ivo Flipse bea9886a12 I noticed that cy+cy and cx+cx was repeated in the inner-most loop as well 2015-06-18 22:01:44 +02:00
Ivo Flipse ded652c2ab Moved more computations out of loops and added division from future 2015-06-18 18:55:32 +02:00
Ivo Flipse f633262f03 Moved more variables out of the loops and modified the docstring 2015-06-18 18:50:34 +02:00
Ivo Flipse 9c141eadf8 Extracted row_index and cell_row from the inner loop
Defined constants that don't have to be recomputed several times
2015-06-18 18:45:29 +02:00
Ivo Flipse 1b9a15a4d4 Made the indents line up with the ( 2015-06-18 18:38:59 +02:00
Josh Warner 91f74fd6c6 Merge pull request #1536 from warmspringwinds/mb-lbp
FEAT: multi-block local binary patterns (MB-LBP)
2015-06-16 12:43:32 -05:00
Korijn van Golen 03b7d638a7 Wrapped long lines according to pep8. 2015-06-16 09:57:49 +02:00
Korijn van Golen 605eac2e8c Renamed to use row/column naming convention. 2015-06-16 09:54:54 +02:00
Korijn van Golen 78cf5a0f9a Removed unused code. 2015-06-16 09:40:04 +02:00
Korijn van Golen 8ab6e63e75 Removed unused import, applied pep8 formatting and corrected a method call
that should have been refactored.
2015-06-16 09:36:02 +02:00
Ivo Flipse c37fc9ec20 Update _hog.py
Made hog_histograms snake case
2015-06-15 22:51:30 +02:00
Ivo Flipse 502377e9ce Update _hoghistogram.pyx
Made the function names PEP8 compatible and added another level of indentation.
I also tried renaming some things where I considered columns useful, but for example cells per row isn't entirely accurate. Any suggestions?
2015-06-15 22:49:20 +02:00
dan 88e3ac45fc Documentation correction. 2015-06-15 22:12:02 +02:00
dan c3e23b0604 Changed x/y to r/c notation. Documentation correction. 2015-06-15 22:04:09 +02:00
Korijn van Golen ecdf71d14d Switched to memory view syntax. 2015-06-15 15:41:18 +02:00
Korijn van Golen aedf63f1f7 Switched to cnp where applicable. 2015-06-15 15:25:30 +02:00
Korijn van Golen 3719ff216c Updated docstrings. 2015-06-15 13:14:34 +02:00
Korijn van Golen c756d2d492 Partially fulfilled code review. 2015-06-15 11:49:21 +02:00
Tim Sheerman-Chase 2e56e685d8 change import syntax for python 3 2015-06-15 11:05:07 +02:00
Tim Sheerman-Chase d55135ddbb Fix comments and tab whitespace 2015-06-15 11:03:58 +02:00
Tim Sheerman-Chase f09907961a Initial attempt at optimising HOG features with cython 2015-06-15 11:03:57 +02:00