Skip to content

enable edc calculation of signals with cdim > 1 #113

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.

Sign up for GitHub

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

Merged
mberz merged 3 commits into from
Jan 22, 2026
Merged

enable edc calculation of signals with cdim > 1 #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8cb7a8f
enable edc calculation of signals with cdim > 1
hoyer-a Jan 6, 2026
6922d21
add shape-check
hoyer-a Jan 6, 2026
c3a48d4
Make tests more strict
hoyer-a Jan 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 19 additions & 3 deletions pyrato/edc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,10 @@ def energy_decay_curve_truncation(
>>> ax.legend()

"""
# flatten to allow signals with cdim > 1
shape = data.time.shape
data = data.flatten()

energy_data = dsp.preprocess_rir(
data,
is_energy=is_energy,
Expand Down Expand Up @@ -311,7 +315,7 @@ def energy_decay_curve_truncation(
/ np.nanmax(energy_decay_curve, axis=-1, keepdims=True)

edc = pf.TimeData(
energy_decay_curve, data.times, comment=data.comment)
energy_decay_curve.reshape(shape), data.times, comment=data.comment)

if plot:
ax = pf.plot.time(data, dB=True, label='RIR')
Expand Down Expand Up @@ -403,6 +407,9 @@ def energy_decay_curve_lundeby(
>>> ax.legend()

"""
# flatten to allow signals with cdim > 1
shape = data.time.shape
data = data.flatten()

energy_data = dsp.preprocess_rir(
data,
Expand Down Expand Up @@ -458,7 +465,7 @@ def energy_decay_curve_lundeby(
/ np.nanmax(energy_decay_curve, axis=-1, keepdims=True)

edc = pf.TimeData(
energy_decay_curve, data.times, comment=data.comment)
energy_decay_curve.reshape(shape), data.times, comment=data.comment)

if plot:
ax = pf.plot.time(data, dB=True, label='RIR')
Expand Down Expand Up @@ -551,6 +558,10 @@ def energy_decay_curve_chu(
>>> ax.legend()

"""
# flatten to allow signals with cdim > 1
shape = data.cshape
data = data.flatten()

energy_data = dsp.preprocess_rir(
data,
is_energy=is_energy,
Expand Down Expand Up @@ -588,6 +599,8 @@ def energy_decay_curve_chu(
trunc_levels = 10*np.log10((psnr)) - threshold
edc = truncate_energy_decay_curve(edc, trunc_levels)

edc = edc.reshape(shape)

if plot:
plt.figure(figsize=(15, 3))
pf.plot.use('light')
Expand Down Expand Up @@ -693,6 +706,9 @@ def energy_decay_curve_chu_lundeby(
>>> ax.legend()

"""
# flatten to allow signals with cdim > 1
shape = data.time.shape
data = data.flatten()

energy_data = dsp.preprocess_rir(
data,
Expand Down Expand Up @@ -754,7 +770,7 @@ def energy_decay_curve_chu_lundeby(
/ np.nanmax(energy_decay_curve, axis=-1, keepdims=True)

edc = pf.TimeData(
energy_decay_curve, data.times, comment=data.comment)
energy_decay_curve.reshape(shape), data.times, comment=data.comment)

if plot:
ax = pf.plot.time(data, dB=True, label='RIR')
Expand Down
27 changes: 27 additions & 0 deletions tests/test_edc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,3 +96,30 @@ def test_edc_sabine():
6.37107964e-04, 5.46555336e-04,
])
npt.assert_almost_equal(edc, truth)


@pytest.mark.parametrize(
"edc_function",
[ra.edc.energy_decay_curve_chu,
ra.edc.energy_decay_curve_lundeby,
ra.edc.energy_decay_curve_chu_lundeby,
ra.energy_decay_curve_lundeby],
)
def test_multidim_edc(edc_function):
"""
Test if edcs from multichannel signal are equal to corresponding single
channel edcs.
"""
rir = pf.signals.files.room_impulse_response()
rir_oct = pf.dsp.filter.fractional_octave_bands(rir, 1)
shape = rir_oct.time.shape
edc = edc_function(rir_oct, channel_independent=True)

assert shape == edc.time.shape

edc = edc.flatten()
rir_oct = rir_oct.flatten()

for i in range(edc.cshape[0]):
baseline = edc_function(rir_oct[i])
npt.assert_array_equal(edc[i].time, baseline.time)