JDWarner
61320957eb
Changes based on PR review recommendations: input format, scaling, and bugfix.
...
In this new version, all instances of 'spectrum' have been replaced with 'channel'. The documentation also reflects this change, and the new multichannel kwarg used to indicate multichannel input is named appropriately.
New boolean multichannel kwarg added, which controls if the input has multiple channels or not. Input 'data' is now array_like for both gray-level and multichannel. This kwarg is needed mainly because a 3-D array could be either 3 spatial dimensions or a set of different 2-D channels.
New scaling kwarg added (may be removed in future), controlling if data scaling is applied to ALL channels or each channel individually, if multichannel=True. No effect for gray-level data.
Removed np.sqrt(gradients) in _compute_weights_3d(), which was a bug. Tests now pass consistently.
New method for maintaining shape from input to output, where dims = data.shape prior to np.atleast_3d(). A theoretical (70,100,1) array passed should now result in a (70,100,1) shaped output, for example.
Updated and fixed multispectral test script to work with new version. TODO: Additional test(s) likely needed to cover code branches from new kwargs.
2012-08-29 16:33:56 -05:00
JDWarner
682d0535cd
Added multispectral random walker test.
...
Since the multispectral path is equivalent except for gradient calcs,
only one test case is needed. This test is modeled on the 3-D
non-multispectral version. If deemed necessary, adding a 2-D case
would be simple.
2012-08-27 13:41:41 -05:00
JDWarner
feca48cc49
Added return_full_prob kwarg to solve call if pyamg not present.
2012-08-27 11:48:32 -05:00
JDWarner
8955dad32e
Multispectral modifications applied to random walker.
2012-08-27 11:42:30 -05:00
Stefan van der Walt
571151958f
Merge pull request #277 from emmanuelle/fix_tests_draw
...
BUG: Fixed two tests that were failing because of draw imports.
2012-08-27 03:16:40 -07:00
Emmanuelle Gouillart
0644026250
Fixed two tests that were failing because of draw imports
2012-08-27 12:04:30 +02:00
Stefan van der Walt
8d54380dc0
Merge pull request #259 from emmanuelle/fix_random_walker
...
ENH: Fix random walker.
2012-08-27 02:40:56 -07:00
Stefan van der Walt
b0d3c053f9
Merge pull request #272 from ahojnnes/template-contiguous
...
BUG: Fix C-contiguous array bug in match template.
2012-08-27 02:39:24 -07:00
Emmanuelle Gouillart
9d29d5df78
PEP8: indentation in random_walker_segmentation
2012-08-27 11:26:11 +02:00
Stefan van der Walt
6de72cc03f
Merge pull request #276 from tonysyu/reconstruction-fix
...
BUG: Fix division error for Python 3 in reconstruction
2012-08-26 14:16:04 -07:00
Tony S Yu
7d8bc48378
ENH: Change assert statement for better error output
2012-08-26 16:36:28 -04:00
Tony S Yu
8084faf1f6
BUG: Fix division error for Python 3
2012-08-26 16:33:25 -04:00
Stefan van der Walt
24ef77ed3e
Merge pull request #273 from ahojnnes/draw-file-deletion
...
STY: Delete unnecessary file in draw package.
2012-08-26 07:23:50 -07:00
Stefan van der Walt
e7f2b0fabc
Merge pull request #274 from ahojnnes/doc-update
...
DOC: Overall cleanups.
2012-08-26 06:20:47 -07:00
Johannes Schönberger
00b3e90e42
Fix description of polygon example script
2012-08-26 08:37:51 +02:00
Johannes Schönberger
db9af0dc2d
Capitalize parameter descriptions in geometric transforms
2012-08-26 08:25:04 +02:00
Johannes Schönberger
fc7859471f
Fix examples of exposure package
2012-08-26 00:35:16 +02:00
Johannes Schönberger
83a52f4d39
Capitalize parameter descriptions in draw package
2012-08-26 00:32:20 +02:00
Johannes Schönberger
e9b8645ee6
Fix parameter format in doc string of peak_local_max
2012-08-26 00:29:18 +02:00
Johannes Schönberger
7acb9f9efb
Fix short description in doc string
2012-08-26 00:27:55 +02:00
Johannes Schönberger
4fe9f39c45
Fix shape format of arrays in doc strings
2012-08-26 00:16:52 +02:00
Johannes Schönberger
24d1b201c9
Delete unnecessary file
2012-08-26 00:10:28 +02:00
Johannes Schönberger
32afefef23
Fix doc string of texture detection
2012-08-26 00:08:29 +02:00
Johannes Schönberger
76f75c8ab6
Fix C-contiguous array bug in match template
2012-08-25 22:46:45 +02:00
Johannes Schönberger
c11e65bf4b
Merge pull request #262 from stefanv/doc_intersphinx
...
DOC: Add intersphinx so we can refer to numpy, scipy, sklearn docs.
2012-08-25 13:19:53 -07:00
Stefan van der Walt
90420f0924
Merge pull request #270 from tonysyu/cython-0.15-compat
...
BUG: Make reconstruction compatible with Cython 0.15.
2012-08-25 11:08:58 -07:00
Tony S Yu
69207c003b
BUG: fix import of rank_order
2012-08-25 14:06:20 -04:00
Tony S Yu
e350db23a2
Change reconstruction to support Cython 0.15.
...
This removes use of Cython's typed memoryviews.
This reverts commit b5d9106966
2012-08-25 14:04:48 -04:00
Stefan van der Walt
ac41a4b1be
Merge pull request #269 from tonysyu/viewer-fix-doc-and-test
...
BUG: Viewer: fix autodoc and nosetest failures.
2012-08-25 10:44:26 -07:00
Stefan van der Walt
ce423e169e
Merge pull request #257 from ahojnnes/shared
...
ENH: Add shared package.
2012-08-25 10:35:29 -07:00
Tony S Yu
be33941701
Change error to warning so that autodoc doesn't fail.
2012-08-25 12:11:46 -04:00
Tony S Yu
b14514e018
BUG: Fix nosetest and autodoc errors when PyQt4 not available
...
nose and autodoc imports the viewer modules so all PyQt4 imports must be wrapped in a try-except block. In addition, any classes derived from PyQt4 must be proxied since the class definition are run on import. This is really hacky.
2012-08-25 12:06:03 -04:00
Stefan van der Walt
544fec7560
Merge pull request #215 from tonysyu/morph-reconstruction
...
ENH: Add morphological reconstruction.
2012-08-25 07:42:36 -07:00
Stefan van der Walt
3c14898fda
Merge pull request #267 from tonysyu/viewer-adapt-dtype
...
BUG: Adjust pixel limits based on image data type.
2012-08-25 07:14:55 -07:00
Tony S Yu
666d6f4f09
DOC: Bump up Cython version up to 0.16
...
This PR uses typed memoryviews, which were introduced in 0.16.
2012-08-25 08:58:54 -04:00
Tony S Yu
945349f963
DOC: Improve description of reconstruction
2012-08-25 08:48:03 -04:00
Stefan van der Walt
3f8d000db3
Merge pull request #266 from tonysyu/viewer-fix-hard-exit
...
BUG: Closing ImageViewer shouldn't quit parent program.
2012-08-25 05:27:33 -07:00
Johannes Schönberger
50d184374a
Optimize fast homography
2012-08-25 13:57:32 +02:00
Johannes Schönberger
af708d2e00
Fix typo in Cython compiler directives
2012-08-25 08:43:42 +02:00
Tony S Yu
ebf4b44a9e
BUG: Adjust pixel limits based on image data type
2012-08-24 22:44:04 -04:00
Tony S Yu
2c0ff0543c
BUG: Closing ImageViewer shouldn't quit parent program
2012-08-24 22:43:13 -04:00
Tony S Yu
2c84a2135f
Remove custom dtype range
...
Bool support was added in gh-#260
2012-08-24 22:36:20 -04:00
Stefan van der Walt
c47e69b466
Merge pull request #260 from ahojnnes/convert-bool
...
ENH: Support for boolean dtype conversion.
2012-08-24 17:56:28 -07:00
Johannes Schönberger
3e6a51cc2a
Add bool dtype range
2012-08-24 23:17:32 +02:00
Stefan van der Walt
786821c747
PKG: Update release notes, plot_pr.
2012-08-24 09:55:16 -07:00
Stefan van der Walt
118aee9207
Merge pull request #261 from emmanuelle/fix_import_glcm
...
BUG: Fix import problem.
2012-08-24 07:08:07 -07:00
Stefan van der Walt
e6118a5068
BUG: Workaround to unit tests failing if PyQt4 not available.
2012-08-24 06:24:41 -07:00
Emmanuelle Gouillart
28161eaee6
ENH: better handling of labels that need to be reordered
...
(this is now done automatically)
2012-08-24 15:09:46 +02:00
Stefan van der Walt
7490322b8a
Merge pull request #229 from tonysyu/qtmpl-viewer
...
ENH: Qt-MPL viewer.
2012-08-24 05:53:13 -07:00
Stefan van der Walt
ecd4fb714a
DOC: Add intersphinx so we can refer to numpy, scipy, sklearn docs.
2012-08-24 05:26:03 -07:00
JDWarner