f426800439
Merge pull request #6 from ClinicalGraphics/fasthog
...
Fasthog
2015-06-18 21:49:14 +01:00
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
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
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
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
be5f6fdc3f
Merge pull request #1562 from warmspringwinds/example_correction
...
DOCFIX: Add missing visualization of MB-LBP plot
2015-06-18 12:47:24 -05:00
b980e7bb98
Use files from tifffile 0.6.2 package
...
Use files from tifffile 0.6.0 package
Skip failing doctests
Skip failing doctests
Fix doctest skipping
Skip another doctest
Skip another doctest
Bump to tifffile 0.6.1 and add test
Use latest tifffile
Sync with 0.6.2
Skip doctests
Skip one more doctest
Another doctest skip
Use relative import in test
Fix import and failing doctest
2015-06-18 12:41:06 -05:00
7a2b0a70f5
Merge pull request #1459 from vighneshbirodkar/seam_carving
...
FEAT: Seam Carving
2015-06-18 12:32:19 -05:00
83739644ec
Merge pull request #5 from ClinicalGraphics/fasthog
...
Fasthog
2015-06-18 18:19:35 +01:00
ded652c2ab
Moved more computations out of loops and added division from future
2015-06-18 18:55:32 +02:00
f633262f03
Moved more variables out of the loops and modified the docstring
2015-06-18 18:50:34 +02:00
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
1b9a15a4d4
Made the indents line up with the (
2015-06-18 18:38:59 +02:00
2516844cbd
added missing visualization of the plot
2015-06-17 10:45:50 +02:00
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
85946c8eed
Changed return type to bint and improved code comments
2015-06-16 19:48:14 +05:30
b0d5067efb
Merge pull request #4 from ClinicalGraphics/fasthog
...
I feel I have the easy job here!
2015-06-16 09:05:35 +01:00
03b7d638a7
Wrapped long lines according to pep8.
2015-06-16 09:57:49 +02:00
605eac2e8c
Renamed to use row/column naming convention.
2015-06-16 09:54:54 +02:00
78cf5a0f9a
Removed unused code.
2015-06-16 09:40:04 +02:00
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
b4a3985c41
Merge pull request #1555 from sciunto/user_guide-joblib
...
DOC: Add link joblib website in userguide
2015-06-15 21:04:00 -05:00
86624a2818
Merge pull request #1558 from blink1073/optimized-window
...
ENH: Create an optimal_step parameter for view_as_windows
2015-06-15 20:50:36 -05:00
c37fc9ec20
Update _hog.py
...
Made hog_histograms snake case
2015-06-15 22:51:30 +02:00
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
88e3ac45fc
Documentation correction.
2015-06-15 22:12:02 +02:00
c3e23b0604
Changed x/y to r/c notation. Documentation correction.
2015-06-15 22:04:09 +02:00
fee667b35c
preallocated seam_buffer and added noil
2015-06-15 20:49:26 +05:30
958f410a5c
Changes example explanation text
2015-06-15 20:47:24 +05:30
e247e3bacc
Precomputation optimizations and docstring changes
2015-06-15 20:19:52 +05:30
ca737e9d85
Merge pull request #3 from ClinicalGraphics/fasthog
...
Switched to memory view syntax.
2015-06-15 15:26:52 +01:00
ecdf71d14d
Switched to memory view syntax.
2015-06-15 15:41:18 +02:00
753523791a
Merge pull request #2 from ClinicalGraphics/fasthog
...
Switched to cnp where applicable.
2015-06-15 14:40:02 +01:00
aedf63f1f7
Switched to cnp where applicable.
2015-06-15 15:25:30 +02:00
3719ff216c
Updated docstrings.
2015-06-15 13:14:34 +02:00
c756d2d492
Partially fulfilled code review.
2015-06-15 11:49:21 +02:00
5aad171d13
Add _hoghistogram.pyx to bento.info
2015-06-15 11:05:08 +02:00
2e56e685d8
change import syntax for python 3
2015-06-15 11:05:07 +02:00
d55135ddbb
Fix comments and tab whitespace
2015-06-15 11:03:58 +02:00
f09907961a
Initial attempt at optimising HOG features with cython
2015-06-15 11:03:57 +02:00
0ffe44a4f0
Ensure consistent handling of division
2015-06-14 20:19:13 -05:00
49967b412b
Create an optimal step parameter for view_as_windows
2015-06-14 17:39:25 -05:00
20e49b2ada
add link joblib website
2015-06-13 20:36:11 -04:00
55fc07edb9
removed reduntant continue, added Cython flags and fixed negative indexing
2015-06-13 23:25:36 +05:30
fe85552596
changed documentation
2015-06-13 07:45:26 +02:00
496e8c090e
the function name was shortened to multiblock_lbp
2015-06-12 20:41:38 +02:00
cbe8f99f30
Documenatation correction
2015-06-12 07:50:38 +02:00
68f627aca7
pep8. Documenatation correction.
2015-06-12 07:49:00 +02:00
360d384633
used gray2rgb function. Code is more readable now.
2015-06-11 08:38:18 +02:00
0e96098e49
small documentation correction
2015-06-11 08:01:26 +02:00
Tim Sheerman-Chase