-
Notifications
You must be signed in to change notification settings - Fork 13
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
concatenate bins #543
Open
ahms5
wants to merge
5
commits into
develop
Choose a base branch
from
feature/concatenate_bins
base: develop
Could not load branches
Branch not found: {{ refName }}
Could not load tags
Nothing to show
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+112
−0
Open
concatenate bins #543
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
baea206
add init impl for conc bins
ahms5 28c4eff
add tests and fix also for timeData
ahms5 726e1d2
just allow FrequencyData and add more tests
ahms5 590c695
add with remove double freqs
ahms5 83fc1b5
remove check double, leave it to the user
ahms5 File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -212,3 +212,45 @@ def concatenate_channels(signals, caxis=0, broadcasting=False): | |
return pf.TimeData(data, signals[0].times) | ||
else: | ||
return pf.FrequencyData(data, signals[0].frequencies) | ||
|
||
|
||
def concatenate_bins(signals): | ||
""" | ||
Merge multiple FrequencyData objects along the frequency axe. | ||
|
||
Parameters | ||
---------- | ||
signals : tuple of FrequencyData | ||
The signals to concatenate. All signals must have the same cshape. | ||
the frequency bins get sorted and doubles are removed, the first | ||
entry is used. | ||
|
||
Returns | ||
------- | ||
merged : FrequencyData | ||
The merged signal object. | ||
""" | ||
# check input | ||
if not isinstance(signals, (tuple, list)): | ||
raise TypeError( | ||
"Input must be a tuple or list of pf.FrequencyData objects.") | ||
|
||
for signal in signals: | ||
if not isinstance(signal, (pf.FrequencyData)): | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This is There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This should also be tested then. |
||
raise TypeError( | ||
"All input data must be of type pf.FrequencyData.") | ||
|
||
# check matching meta data of input signals. | ||
[signals[0]._assert_matching_meta_data(s) for s in signals] | ||
|
||
# concatenate data | ||
data = np.concatenate([s.freq for s in signals], axis=-1) | ||
frequencies = np.concatenate([s.frequencies for s in signals], axis=-1) | ||
|
||
# Sort frequency entries | ||
idx = np.argsort(frequencies) | ||
frequencies = frequencies[idx] | ||
data = data[..., idx] | ||
|
||
# return merged Signal | ||
return pf.FrequencyData(data, frequencies) |
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Since we now have functions to broadcast cshapes of audio objects it would be nice to include this by default to make this more flexible.