09c8a84a54
Merge pull request #1518 from stefanv/relative_imports
...
Consistently use relative imports
2015-07-12 14:41:06 -05:00
89a717ef3f
TST: Reduced size of image in test_blob:test_blob_log for speed
2015-07-11 16:40:32 -05:00
9c6ab1bc18
TST: Use quarter size images to speed up test_censure unit tests
2015-07-11 16:28:58 -05:00
83d5ff9001
Consistently use relative imports
2015-07-11 15:41:37 -05:00
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
17a1121e42
Merge pull request #595 from TimSC/fasthog
...
ENH: Fast, Cython based hog implementation
2015-07-04 10:49:56 -05:00
55f798109c
Fix a broken link to daisy code
2015-07-04 18:39:02 +09:00
cd30e010d5
Also added a nogil context manager to hoghistograms
2015-06-19 16:01:52 +02:00
691beaa59f
Adding nogil to cell_hog
2015-06-19 15:49:48 +02:00
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
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
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
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
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
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
ecdf71d14d
Switched to memory view syntax.
2015-06-15 15:41:18 +02: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
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
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
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
cc81bdb26b
moved multiblocl_local_binary_pattern in python file in order for sphinx to be able to correctly creat documentation.
2015-06-11 07:52:06 +02:00
d20eae7cd1
small correction in documentation.
2015-06-10 11:43:05 +02:00
61442e040e
Switched to using integrate Cython function from skimage._shared. All changes were made to make it fit.
2015-06-10 11:38:20 +02:00
c4f8e0126b
MBLBP is cdef function now. Corrected the example repeated imports.
2015-06-09 17:04:11 +02:00
fb6ef72a31
public MBLBP function created for users to safely use it.
2015-06-09 14:56:29 +02:00
d39434c30e
MBLBP optimized by taking out constants definition out of function. Visualization function of MBLBP now supports colors and opacity. Examples are updated.
2015-06-09 14:18:58 +02:00
0d134987f9
Harmonize all ndimage usage across the library
...
Only two forms remain in use:
- `from scipy import ndimage as ndi`
- `from scipy.ndimage import function`
2015-06-09 15:18:37 +10:00
83c3bd10c8
Cython implementation of MB-LBP. Updated MB-LBP visualization without matplotlib.Examples to gallery were added. Tests are made more easily readable.
2015-06-08 09:16:22 +02:00
086d8c667b
imports now inside of the file
2015-05-29 23:03:12 +02:00
3c82d9505f
plain python multiblock lbp implemented with test coverage
2015-05-29 22:58:39 +02:00
990892fcde
Replace libc.math.NAN with numpy.math.NAN for MSVC
2015-05-21 08:27:00 -07:00
Steven Silvester