Commit Graph

7113 Commits

Author SHA1 Message Date
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
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
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 5aad171d13 Add _hoghistogram.pyx to bento.info 2015-06-15 11:05:08 +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
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
Vighnesh Birodkar cacd214d68 Corrected Typo 2015-06-06 21:36:00 +05:30
Stefan van der Walt 805e322ea9 Remove logo (moved to branding repo) 2015-06-05 12:54:57 -07:00
Vighnesh Birodkar 8a78ad87ed skip loop when min and max are equal 2015-06-06 00:51:30 +05:30
Stefan van der Walt 658fe02683 Merge pull request #1542 from michaelaye/patch-2
Remove unnecessary loop counter
2015-06-05 11:23:14 -07:00
K.-Michael Aye fdc7e6f99a removing unnecessary loop counter
Why use an un-pythonic counter if it's not required? ;)
2015-06-05 11:54:28 -06:00
Stefan van der Walt ae2b0a26db Merge pull request #1534 from michaelaye/patch-1
Removing see-also to unexposed internal function
2015-06-03 10:55:58 -07:00
Vighnesh Birodkar 18b1906607 removed debug statements 2015-06-03 22:03:34 +05:30
Vighnesh Birodkar 23c6111ad3 Fixing error in ncut when subgraph as all equal weights (#1538) 2015-06-03 21:58:26 +05:30
Juan Nunez-Iglesias 15f2273272 Merge pull request #1537 from kevin-keraudren/ellipse-round-radius
the output of hough_ellipse needs to be rounded before being truncated
2015-06-01 10:58:33 +10:00
Kevin Keraudren 4dfa467c34 code simplification 2015-05-31 15:25:41 +01:00
Kevin Keraudren 941cdda8f5 the output of hough_ellipse needs to be rounded before being truncated 2015-05-30 20:47:37 +01:00
K.-Michael Aye 56fc42ad47 removing obsolete (or not found?) link
`intensity_range` does not seem to exist or is not found. Removing obsolete reference in doctext.
2015-05-29 12:06:46 -06:00
Josh Warner 3faa32149a Merge pull request #1526 from arve0/installation_instructions
Add dask[array], improve CI builds, update install instructions
2015-05-29 10:38:09 -05:00
Juan Nunez-Iglesias e497e5c4f5 Merge pull request #1530 from LeeKamentsky/master
Watershed fixes for issue #803 (incorrect propagation in plateaus)
2015-05-29 16:58:36 +10:00