Fixed #582 Allow 1D Mean/Stddev Match Params (#583)

Author: seanlaw

stumpy/aamp_motifs.py

@@ -380,6 +380,8 @@ def max_distance(D):
 
     if T_subseq_isfinite is None:
         T, T_subseq_isfinite = core.preprocess_non_normalized(T, m)
+    if len(T_subseq_isfinite.shape) == 1:
+        T_subseq_isfinite = T_subseq_isfinite[np.newaxis, :]
 
     D = np.empty((d, n - m + 1))
     for i in range(d):

stumpy/motifs.py

@@ -445,6 +445,10 @@ def max_distance(D):
 
     if M_T is None or Σ_T is None:  # pragma: no cover
         T, M_T, Σ_T = core.preprocess(T, m)
+    if len(M_T.shape) == 1:
+        M_T = M_T[np.newaxis, :]
+    if len(Σ_T.shape) == 1:
+        Σ_T = Σ_T[np.newaxis, :]
 
     D = np.empty((d, n - m + 1))
     for i in range(d):

tests/test_aamp_motifs.py

@@ -2,7 +2,7 @@
 import numpy.testing as npt
 import pytest
 
-from stumpy import aamp_motifs, aamp_match
+from stumpy import core, aamp_motifs, aamp_match
 
 import naive
 
@@ -211,3 +211,31 @@ def test_aamp_match(Q, T):
         )
 
         npt.assert_almost_equal(left, right)
+
+
+@pytest.mark.parametrize("Q, T", test_data)
+def test_aamp_match_T_subseq_isfinite(Q, T):
+    m = Q.shape[0]
+    excl_zone = int(np.ceil(m / 4))
+    max_distance = 0.3
+    T, T_subseq_isfinite = core.preprocess_non_normalized(T, len(Q))
+
+    for p in [1.0, 2.0, 3.0]:
+        left = naive_aamp_match(
+            Q,
+            T,
+            p=p,
+            excl_zone=excl_zone,
+            max_distance=max_distance,
+        )
+
+        right = aamp_match(
+            Q,
+            T,
+            T_subseq_isfinite,
+            p=p,
+            max_matches=None,
+            max_distance=max_distance,
+        )
+
+        npt.assert_almost_equal(left, right)

tests/test_motifs.py

@@ -235,3 +235,30 @@ def test_match(Q, T):
     )
 
     npt.assert_almost_equal(left, right)
+
+
+@pytest.mark.parametrize("Q, T", test_data)
+def test_match_mean_stddev(Q, T):
+    m = Q.shape[0]
+    excl_zone = int(np.ceil(m / 4))
+    max_distance = 0.3
+
+    left = naive_match(
+        Q,
+        T,
+        excl_zone,
+        max_distance=max_distance,
+    )
+
+    M_T, Σ_T = core.compute_mean_std(T, len(Q))
+
+    right = match(
+        Q,
+        T,
+        M_T,
+        Σ_T,
+        max_matches=None,
+        max_distance=lambda D: max_distance,  # also test lambda functionality
+    )
+
+    npt.assert_almost_equal(left, right)