allow separate wavelet/mode for each axis in routines based on dwtn/idwtn #272
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Current coverage is 86.35% (diff: 93.33%)@@ master #272 diff @@
==========================================
Files 20 21 +1
Lines 3056 3085 +29
Methods 45 45
Messages 0 0
Branches 525 532 +7
==========================================
+ Hits 2637 2664 +27
+ Misses 369 368 -1
- Partials 50 53 +3
|
|
The one failure for 3.5 on Travis looks like a fluke. The error was related to curl failing to download python-3.5. |
rgommers
reviewed
Jan 18, 2017
| @@ -218,10 +227,12 @@ def idwtn(coeffs, wavelet, mode='symmetric', axes=None): | |||
| Dictionary as in output of `dwtn`. Missing or None items | |||
| will be treated as zeroes. | |||
| wavelet : Wavelet object or name string | |||
| Wavelet to use | |||
| mode : str, optional | |||
| Wavelet to use. This can also be a list containing a wavelet to | |||
There was a problem hiding this comment.
nitpick: "list" --> "tuple" for consistency with the other functions
rgommers
reviewed
Jan 18, 2017
| If a single Wavelet is provided, it will used for all axes. Otherwise | ||
| one Wavelet per axis must be provided. | ||
| axes : list | ||
| The list of axes to be transormed. |
rgommers
reviewed
Jan 18, 2017
| Returns | ||
| ------- | ||
| wavelets : list of Wavelet objects | ||
| A list of Wavlets equal in length to axes. |
|
Is there a reason you left out |
|
There was no good reason not to add Otherwise, I made the suggested changes and also updated the docstrings in |
|
LGTM, merged. Thanks @grlee77! |
|
The |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
An example where this could be useful is in video processing (or volume+time medical imaging applications) where it may make sense to use a different wavelet or edge mode on the time axis as opposed to the spatial axes.
This is also functionality that is needed for implementing the dual-tree complex DWT. The n-dimensional dual-tree CDWT involves
2**nseperatewavedecndecompositions with different choices among two different filters along each axis. e.g. in 2D if the two dual-tree wavelets arew0andw1, there are 4 separate decompositions using wavelets(w0, w0), (w0, w1), (w1, w0), (w1, w1)where the elements of the tuple indicate which filter to apply along each axis.The primary change is implemented in
dwtnandidwtn. It was then easy to extend to the following routines that are built on top ofdwtnandidwtn: