Commit Graph

616 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 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
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
Johannes Schönberger 990892fcde Replace libc.math.NAN with numpy.math.NAN for MSVC 2015-05-21 08:27:00 -07:00
Johannes Schönberger a2ddba21a5 Do not acquire GIL for hessian_matrix_det 2015-05-20 20:22:02 -07:00
Johannes Schönberger 4a95345489 Do not acquire GIL for texture functions 2015-05-20 17:51:41 -07:00
Johannes Schönberger 9cd7ca5881 Do not acquire GIL for BRIEF 2015-05-20 17:39:46 -07:00
Johannes Schönberger bca458bc1c Do not acquire GIL for CENSURE 2015-05-20 09:04:58 -07:00
Johannes Schönberger a489b85b22 Do not acquire GIL for corner detectors 2015-05-20 07:45:04 -07:00
Johannes Schönberger c52c7f4bfb Do not acquire GIL for ORB 2015-05-20 07:38:47 -07:00
Daniel Wennberg d5099db362 Fix PEP8 2015-05-03 01:32:56 +02:00
Daniel Wennberg b80e494484 Change data types to conform to style guide 2015-05-02 18:12:30 +02:00
Daniel Wennberg dc0a91b569 Fix doctests for #1257
Changing the return type of the blob functions from integer to float
arrays invalidated the docstring examples. Updating the examples fixes
the doctests.
2015-05-02 18:12:30 +02:00
Daniel Wennberg c86c6effe8 Fix tests for #1257
The test of blob_doh() set an unrealistically strict threshold for the
accuracy of the estimated blob radius, causing the test to fail with the
true floating-point value (previously, the test passed only because
sigma was truncated to integer). Increasing the threshold fixes the
problem.
2015-05-02 18:12:30 +02:00
Eric 833edc17ef Fixed typo 2015-05-02 18:12:30 +02:00
Eric eb6ddc735b Changed local_maxima to float32 2015-05-02 18:12:30 +02:00
Eric 43246e30af Blob detection supports for non-integer sigmas 2015-05-02 18:12:30 +02:00
Stefan van der Walt d6870c6de7 Merge pull request #1066 from msarahan/PhaseCorrelation
Add subpixel shift registration
2015-03-02 08:30:45 -08:00
Johannes Schönberger 84bcb583d7 Fix Hessian matrix eigvals 2015-02-23 22:32:04 -05:00
Michael Sarahan 71a89697f0 improve test coverage. Use SciPy's fourier_shift for examples. 2015-02-21 11:33:37 -08:00
Michael Sarahan cf09b0c5ef Incorporate fixes for complex images 2015-02-20 20:55:46 -08:00
Steven Silvester ed7aecdc4c Fix links 2015-02-07 19:33:30 -06:00
Steven Silvester be7154f23d Skip build on 3.2
Skip doc build on 3.2

Skip doc build on 3.2

Use block literal

Fix html make target

Revert change to threshold_isodata

Fix skimage.novice and thresholding warnings

Fix feature.__init__ __all__

Fix generic.py link

Doc reference fixes

Fix missing class member warnings

Add parallelization to the user guide toc

Remove unused automodule directives

Fix sub_dirs in gallery_index

Remove unused file and fix reference to api/api

Add missing links to user guide

Use pre-output links to images

Recover from Juan's doc 'upgrades'
2015-02-07 16:40:37 -06:00
Michael Sarahan 03dc489457 Add subpixel-precision image translation registration function to feature module 2015-01-29 20:09:50 -08:00
Steven Silvester b6a1bcdb06 Merge pull request #1324 from ahojnnes/rel-import
Use relative imports in skimage files
2015-01-25 15:26:34 -06:00
kpk09 305f5fd225 Using numpy.argwhere makes code easier to read 2015-01-25 00:22:11 +00:00
kpk09 c5ac705123 Fixed bug in feature.peak_local_max: num_peaks should now be usable for ND arrays. 2015-01-25 00:19:12 +00:00
kpk09 22ffc20fc4 Added broken test for feature.peak_local_max when the image is 3D and num_peaks is set. The current code only holds for 2D images. 2015-01-25 00:15:20 +00:00
Johannes Schönberger ee5c6fbeb2 Use relative imports in skimage files 2015-01-22 07:36:48 -05:00
Steven Silvester f898bd0209 Style fixes 2014-12-26 11:26:30 -06:00
Steven Silvester c0a0490eed Fix handling of multiple warnings and update tests
Fix handling of multiple warnings

Update all test __init__ files

Update segmentation pkg

Update the color pkg

Update the exposure pkg

Update the filters pkg

Update the io pkg

Update the measure pkg

Update morphology package

Restructure test setup function

Add expected_warnings to __all__

Update restoration pkg.

Remove explicit filter check since it is done elsewhere

Fix the image test helpers

Update the transform pkg

Fix util pkg

Update viewer pkg
2014-12-23 16:51:06 -06:00
Steven Silvester 4680f30466 Add a test setup helper function
Add a function to set up a skimage test

Switch to new test helper function

Import local packages that raise warnings in test setup function

More fixes to doctests

Fix regionprops doc test

Try and fix the test_rank failure.

Remove no longer needed RectangleSelector shim

Skip more doctests in _regionprops

Try importing another scipy subpackage
2014-12-23 16:49:20 -06:00
Steven Silvester f72882fbd2 Import scipy before turning on warnings 2014-12-23 16:49:19 -06:00
Steven Silvester 9e8f91930e Handle warnings in several packages
Start handling warnings in data, exposure, and draw

Add a known_warning decorator and suppress warnings in color pkg

Use the existing all_warnings context manager

Raise warnings in data

Raise warnings in draw

Raise warnings in exposure

Suppress warnings in exposure tests

Add comments about warning suppressions

Raise warnings in feature

Fix warnings in filter package

Add warning handling to graph

Handle warnings in io package
2014-12-23 16:47:41 -06:00
Johannes Schönberger 20d81529f4 Fix matching test cases 2014-12-23 12:40:15 +01:00