ezmsg-sigproc 1.3.2__tar.gz → 1.3.3__tar.gz

{ezmsg_sigproc-1.3.2 → ezmsg_sigproc-1.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: ezmsg-sigproc
-Version: 1.3.2
+Version: 1.3.3
 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-1.3.2 → ezmsg_sigproc-1.3.3}/src/ezmsg/sigproc/__version__.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.3.2'
-__version_tuple__ = version_tuple = (1, 3, 2)
+__version__ = version = '1.3.3'
+__version_tuple__ = version_tuple = (1, 3, 3)

{ezmsg_sigproc-1.3.2 → ezmsg_sigproc-1.3.3}/src/ezmsg/sigproc/affinetransform.py

@@ -76,16 +76,15 @@ def affine_transform(
             ):
                 in_labels = msg_in.axes[axis].labels
                 new_labels = []
-                n_in = weights.shape[1 if right_multiply else 0]
-                n_out = weights.shape[0 if right_multiply else 1]
+                n_in, n_out = weights.shape
                 if len(in_labels) != n_in:
                     # Something upstream did something it wasn't supposed to. We will drop the labels.
                     ez.logger.warning(
                         f"Received {len(in_labels)} for {n_in} inputs. Check upstream labels."
                     )
                 else:
-                    b_used_inputs = np.any(weights, axis=0 if right_multiply else 1)
-                    b_filled_outputs = np.any(weights, axis=1 if right_multiply else 0)
+                    b_filled_outputs = np.any(weights, axis=0)
+                    b_used_inputs = np.any(weights, axis=1)
                     if np.all(b_used_inputs) and np.all(b_filled_outputs):
                         # All inputs are used and all outputs are used, but n_in != n_out.
                         # Mapping cannot be determined.

{ezmsg_sigproc-1.3.2 → ezmsg_sigproc-1.3.3}/tests/test_affine_transform.py

@@ -1,5 +1,7 @@
 import copy
+from dataclasses import dataclass, field
 from pathlib import Path
+import typing
 
 import numpy as np
 from ezmsg.util.messages.axisarray import AxisArray
@@ -9,11 +11,33 @@ from ezmsg.sigproc.affinetransform import affine_transform, common_rereference
 from util import assert_messages_equal
 
 
+# Define a custom Axis class that has a `labels` attribute
+@dataclass
+class CustomAxis(AxisArray.Axis):
+    labels: typing.List[str] = field(default_factory=lambda: [])
+
+    @classmethod
+    def SpaceAxis(
+        cls, labels: typing.List[str]
+    ):  # , locs: typing.Optional[npt.NDArray] = None):
+        return cls(unit="mm", labels=labels)
+
+
+# Monkey-patch AxisArray with our customized Axis
+AxisArray.Axis = CustomAxis
+
+
 def test_affine_generator():
     n_times = 13
     n_chans = 64
     in_dat = np.arange(n_times * n_chans).reshape(n_times, n_chans)
-    msg_in = AxisArray(in_dat, dims=["time", "ch"])
+    msg_in = AxisArray(
+        data=in_dat,
+        dims=["time", "ch"],
+        axes={
+            "ch": AxisArray.Axis.SpaceAxis(labels=[f"ch_{i}" for i in range(n_chans)])
+        },
+    )
 
     backup = [copy.deepcopy(msg_in)]
 
@@ -25,33 +49,38 @@ def test_affine_generator():
 
     assert_messages_equal([msg_in], backup)
 
+    # Send again just to make sure the generator doesn't crash
+    _ = gen.send(msg_in)
+
     # Test with weights from a CSV file.
     csv_path = Path(__file__).parent / "resources" / "xform.csv"
     weights = np.loadtxt(csv_path, delimiter=",")
     expected_out = in_dat @ weights.T
     # Same result: expected_out = np.vstack([(step[None, :] * weights).sum(axis=1) for step in in_dat])
 
-    # Send again just to make sure the generator doesn't crash
-    _ = gen.send(msg_in)
-
     gen = affine_transform(weights=csv_path, axis="ch", right_multiply=False)
     msg_out = gen.send(msg_in)
     assert np.allclose(msg_out.data, expected_out)
+    assert len(msg_out.axes["ch"].labels) == weights.shape[0]
+    assert msg_out.axes["ch"].labels[:-1] == msg_in.axes["ch"].labels
 
     # Try again as str, not Path
     gen = affine_transform(weights=str(csv_path), axis="ch", right_multiply=False)
     msg_out = gen.send(msg_in)
     assert np.allclose(msg_out.data, expected_out)
+    assert len(msg_out.axes["ch"].labels) == weights.shape[0]
 
     # Try again as direct ndarray
     gen = affine_transform(weights=weights, axis="ch", right_multiply=False)
     msg_out = gen.send(msg_in)
     assert np.allclose(msg_out.data, expected_out)
+    assert len(msg_out.axes["ch"].labels) == weights.shape[0]
 
     # One more time, but we pre-transpose the weights and do not override right_multiply
     gen = affine_transform(weights=weights.T, axis="ch", right_multiply=True)
     msg_out = gen.send(msg_in)
     assert np.allclose(msg_out.data, expected_out)
+    assert len(msg_out.axes["ch"].labels) == weights.shape[0]
 
 
 def test_affine_passthrough():