enable edc calculation of signals with cdim > 1

Author: hoyer-a

pyrato/edc.py

@@ -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,
@@ -309,7 +313,7 @@ def energy_decay_curve_truncation(
             energy_decay_curve /= max_start_value
 
     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')
@@ -401,6 +405,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,
@@ -455,7 +462,7 @@ def energy_decay_curve_lundeby(
             energy_decay_curve /= max_start_value
 
     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')
@@ -548,6 +555,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,
@@ -582,6 +593,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')
@@ -687,6 +700,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,
@@ -746,7 +762,7 @@ def energy_decay_curve_chu_lundeby(
             energy_decay_curve /= max_start_value
 
     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')

tests/test_edc.py

@@ -96,3 +96,24 @@ 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 multidimenstional signals can be calculated.
+    Check if first 0.4 s contain NaNs.
+    """
+    rir = pf.signals.files.room_impulse_response()
+    rir_oct = pf.dsp.filter.fractional_octave_bands(rir, 1)
+    edc = edc_function(rir_oct)
+
+    npt.assert_array_equal(
+        np.isfinite(edc.time[..., :int(rir.sampling_rate*0.4)]), True)
+