Tim Sheerman-Chase
70a0ed58d5
Merge pull request #8 from ClinicalGraphics/fasthog
...
Fasthog
2015-06-19 18:02:43 +01: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
Tim Sheerman-Chase
8d31edb773
Merge pull request #7 from ClinicalGraphics/fasthog
...
Fixed the lines that were failing the tests
2015-06-19 09:40:17 +01: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
Tim Sheerman-Chase
f426800439
Merge pull request #6 from ClinicalGraphics/fasthog
...
Fasthog
2015-06-18 21:49:14 +01: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
Tim Sheerman-Chase
83739644ec
Merge pull request #5 from ClinicalGraphics/fasthog
...
Fasthog
2015-06-18 18:19:35 +01: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
Tim Sheerman-Chase
b0d5067efb
Merge pull request #4 from ClinicalGraphics/fasthog
...
I feel I have the easy job here!
2015-06-16 09:05:35 +01: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
Tim Sheerman-Chase
ca737e9d85
Merge pull request #3 from ClinicalGraphics/fasthog
...
Switched to memory view syntax.
2015-06-15 15:26:52 +01:00
Korijn van Golen
ecdf71d14d
Switched to memory view syntax.
2015-06-15 15:41:18 +02:00
Tim Sheerman-Chase
753523791a
Merge pull request #2 from ClinicalGraphics/fasthog
...
Switched to cnp where applicable.
2015-06-15 14:40:02 +01: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 and Korijn van Golen
5aad171d13
Add _hoghistogram.pyx to bento.info
2015-06-15 11:05:08 +02:00
Tim Sheerman-Chase and Korijn van Golen
2e56e685d8
change import syntax for python 3
2015-06-15 11:05:07 +02:00
Tim Sheerman-Chase and Korijn van Golen
d55135ddbb
Fix comments and tab whitespace
2015-06-15 11:03:58 +02:00
Tim Sheerman-Chase and Korijn van Golen
f09907961a
Initial attempt at optimising HOG features with cython
2015-06-15 11:03:57 +02:00
Josh Warner
7132df764e
Merge pull request #1550 from jni/ndi
...
STY: Harmonize scipy.ndimage usage across the library
2015-06-10 22:16:00 -05:00
Juan Nunez-Iglesias
56d62b39be
Split scipy.ndimage & spatial into different lines
...
This improves the readability of the import code and is in line with
PEP8 recommendations.
2015-06-11 11:36:48 +10:00
Juan Nunez-Iglesias
0a8fc08ec1
Specify ndimage as ndi import convention
...
... in CONTRIBUTING.txt for future contributions.
2015-06-10 15:12:34 +10:00
Steven Silvester
3434b19299
Merge pull request #1549 from JDWarner/fix_tiffile_c_replacement
...
FIX: Correct typo in local version of tifffile _replace_by
2015-06-09 16:42:25 -05:00
Juan Nunez-Iglesias
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
Josh Warner (Mac)
8d8ac736ed
DOC/STY: Fix whitespace, harmonize version with PyPi 0.4.1
2015-06-08 22:33:02 -05:00
Juan Nunez-Iglesias
82a5d0c5d9
Remove unused variable in example
2015-06-09 11:45:10 +10:00
Josh Warner (Mac)
f81dfd84fd
FIX: typo in local version of tifffile _replace_by
2015-06-08 17:20:10 -05:00
Josh Warner
46057c489b
Merge pull request #1535 from stefanv/doc/installation
...
DOC: Simplify installation instructions
2015-06-07 19:05:59 -05:00
Josh Warner
84c79541a5
Merge pull request #1546 from blink1073/window-size
...
ENH: Allow ``view_as_windows`` to take a non-tuple step, and update tests
2015-06-07 16:08:47 -05:00
Stefan van der Walt
580db16cb1
Simplify installation instructions
2015-06-07 07:56:41 -07:00
Steven Silvester
38c7c26460
Style and doc updates
2015-06-07 06:30:12 -05:00
Steven Silvester
38e5919248
Merge pull request #1543 from stefanv/docs/remove_logo
...
Remove logo (moved to branding repo)
2015-06-07 06:22:39 -05:00
Steven Silvester
087c14d0d7
Merge pull request #1545 from cgohlke/patch-1
...
DOC: add WinPython distribution; correct spelling
2015-06-07 06:19:34 -05:00
Steven Silvester
eb8c2d2853
Fix typo
2015-06-07 06:15:24 -05:00
Steven Silvester
3f8e94ff0c
Allow view_as_window to take a tuple step, and update tests
2015-06-07 06:13:36 -05:00
Christoph Gohlke
29c49e914b
DOC: add WinPython distribution; correct spelling
2015-06-06 22:12:47 -07:00
Juan Nunez-Iglesias
da8e2c7c69
Merge pull request #1540 from vighneshbirodkar/ncut_fix
...
Fixes #1538
2015-06-07 11:21:29 +10:00
Tim Sheerman-Chase