ezmsg-sigproc 2.0.0__py3-none-any.whl → 2.1.0__py3-none-any.whl

ezmsg/sigproc/__version__.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '2.0.0'
-__version_tuple__ = version_tuple = (2, 0, 0)
+__version__ = version = '2.1.0'
+__version_tuple__ = version_tuple = (2, 1, 0)

ezmsg/sigproc/aggregate.py

@@ -36,6 +36,7 @@ class AggregationFunction(OptionsEnum):
     NANSUM = "nansum"
     ARGMIN = "argmin"
     ARGMAX = "argmax"
+    TRAPEZOID = "trapezoid"
 
 
 AGGREGATORS = {
@@ -54,6 +55,9 @@ AGGREGATORS = {
     AggregationFunction.NANSUM: np.nansum,
     AggregationFunction.ARGMIN: np.argmin,
     AggregationFunction.ARGMAX: np.argmax,
+    # Note: Some methods require x-coordinates and
+    #  are handled specially in `_process`.
+    AggregationFunction.TRAPEZOID: np.trapezoid,
 }
 
 
@@ -144,10 +148,23 @@ class RangedAggregateTransformer(
         ax_idx = message.get_axis_idx(axis)
         agg_func = AGGREGATORS[self.settings.operation]
 
-        out_data = [
-            agg_func(slice_along_axis(message.data, sl, axis=ax_idx), axis=ax_idx)
-            for sl in self._state.slices
-        ]
+        if self.settings.operation in [
+            AggregationFunction.TRAPEZOID,
+        ]:
+            # Special handling for methods that require x-coordinates.
+            out_data = [
+                agg_func(
+                    slice_along_axis(message.data, sl, axis=ax_idx),
+                    x=self._state.ax_vec[sl],
+                    axis=ax_idx,
+                )
+                for sl in self._state.slices
+            ]
+        else:
+            out_data = [
+                agg_func(slice_along_axis(message.data, sl, axis=ax_idx), axis=ax_idx)
+                for sl in self._state.slices
+            ]
 
         msg_out = replace(
             message,

ezmsg/sigproc/bandpower.py

@@ -36,6 +36,9 @@ class BandPowerSettings(ez.Settings):
     (min, max) tuples of band limits in Hz.
     """
 
+    aggregation: AggregationFunction = AggregationFunction.MEAN
+    """:obj:`AggregationFunction` to apply to each band."""
+
 
 class BandPowerTransformer(CompositeProcessor[BandPowerSettings, AxisArray, AxisArray]):
     @staticmethod
@@ -50,7 +53,7 @@ class BandPowerTransformer(CompositeProcessor[BandPowerSettings, AxisArray, Axis
                 settings=RangedAggregateSettings(
                     axis="freq",
                     bands=settings.bands,
-                    operation=AggregationFunction.MEAN,
+                    operation=settings.aggregation,
                 )
             ),
         }
@@ -68,6 +71,7 @@ def bandpower(
         (17, 30),
         (70, 170),
     ],
+    aggregation: AggregationFunction = AggregationFunction.MEAN,
 ) -> BandPowerTransformer:
     """
     Calculate the average spectral power in each band.
@@ -77,6 +81,8 @@ def bandpower(
     """
     return BandPowerTransformer(
         settings=BandPowerSettings(
-            spectrogram_settings=spectrogram_settings, bands=bands
+            spectrogram_settings=spectrogram_settings,
+            bands=bands,
+            aggregation=aggregation,
         )
     )

{ezmsg_sigproc-2.0.0.dist-info → ezmsg_sigproc-2.1.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ezmsg-sigproc
-Version: 2.0.0
+Version: 2.1.0
 Summary: Timeseries signal processing implementations in ezmsg
 Author-email: Griffin Milsap <griffin.milsap@gmail.com>, Preston Peranich <pperanich@gmail.com>, Chadwick Boulay <chadwick.boulay@gmail.com>
 License-Expression: MIT

{ezmsg_sigproc-2.0.0.dist-info → ezmsg_sigproc-2.1.0.dist-info}/RECORD

@@ -1,10 +1,10 @@
 ezmsg/sigproc/__init__.py,sha256=8K4IcOA3-pfzadoM6s2Sfg5460KlJUocGgyTJTJl96U,52
-ezmsg/sigproc/__version__.py,sha256=2thmcF9DS_Zp1zHI3N0kjBeMAuCP9mdDGnL0clqQpS8,511
+ezmsg/sigproc/__version__.py,sha256=dseuoOPG9WZ1Ezr1SC3wS9_hczkX-b1NdE4TQPHFJso,511
 ezmsg/sigproc/activation.py,sha256=qWAhpbFBxSoqbGy4P9JKE5LY-5v8rQI1U81OvNxBG2Y,2820
 ezmsg/sigproc/adaptive_lattice_notch.py,sha256=3M65PrZpdgBlQtE7Ph4Gu2ISIyWw4j8Xxhm5PpSkLFw,9102
 ezmsg/sigproc/affinetransform.py,sha256=WU495KoDKZfHPS3Dumh65rgf639koNlfDIx_torIByg,8662
-ezmsg/sigproc/aggregate.py,sha256=sdVzSXDg9BUNT-ljyvrWLeoZtRTlfisP0OxEchbgyMM,6111
-ezmsg/sigproc/bandpower.py,sha256=N9pDz1X6ZTNP6VpCcfoXhj32j_9KpMaMuVYimoS6Jpc,2083
+ezmsg/sigproc/aggregate.py,sha256=KR3u9D9jx9KcOQlvI10I6krSxbZCIerG2i4u5Wu5qMI,6754
+ezmsg/sigproc/bandpower.py,sha256=j-Y6iWjD2xkggfi-4HAFJVBPJHHBGvAZy1uM4murZkQ,2319
 ezmsg/sigproc/base.py,sha256=PQr03O2P1v9LzcSR0GJLvPpBCLtnmGaz76gUeXphcH4,48753
 ezmsg/sigproc/butterworthfilter.py,sha256=7ZP4CRsXBt3-5dzyUjD45vc0J3Fhpm4CLrk-ps28jhc,5305
 ezmsg/sigproc/cheby.py,sha256=-aSauAwxJmmSSiRaw5qGY9rvYFOmk1bZlS4gGrS0jls,3737
@@ -45,7 +45,7 @@ ezmsg/sigproc/util/message.py,sha256=l_b1b6bXX8N6VF9RbUELzsHs73cKkDURBdIr0lt3CY0
 ezmsg/sigproc/util/profile.py,sha256=KNJ_QkKelQHNEp2C8MhqzdhYydMNULc_NQq3ccMfzIk,5775
 ezmsg/sigproc/util/sparse.py,sha256=8Ke0jh3jRPi_TwIdLTwLdojQiaqPs6QV-Edqpx81VoI,1036
 ezmsg/sigproc/util/typeresolution.py,sha256=5R7xmG-F4CkdqQ5aoQnqM-htQb-VwAJl58jJgxtClys,3146
-ezmsg_sigproc-2.0.0.dist-info/METADATA,sha256=6QpdeS-5kMO5DogCy7LpB6ho0sQN5rnpfRwF7TwgXg4,2479
-ezmsg_sigproc-2.0.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-ezmsg_sigproc-2.0.0.dist-info/licenses/LICENSE.txt,sha256=seu0tKhhAMPCUgc1XpXGGaCxY1YaYvFJwqFuQZAl2go,1100
-ezmsg_sigproc-2.0.0.dist-info/RECORD,,
+ezmsg_sigproc-2.1.0.dist-info/METADATA,sha256=DuXuzu_YGIIldSiNwz9g72hu5x8JAHjxhGGsy5JXkS0,2479
+ezmsg_sigproc-2.1.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+ezmsg_sigproc-2.1.0.dist-info/licenses/LICENSE.txt,sha256=seu0tKhhAMPCUgc1XpXGGaCxY1YaYvFJwqFuQZAl2go,1100
+ezmsg_sigproc-2.1.0.dist-info/RECORD,,