Fixed #1151 Forward query_idx from aamp_match to core.mass_absolute

stumpy/aamp_motifs.py

@@ -398,7 +398,9 @@ def aamp_match(
 
     D = np.empty((d, n - m + 1))
     for i in range(d):
-        D[i, :] = core.mass_absolute(Q[i], T[i], T_subseq_isfinite[i], p=p)
+        D[i, :] = core.mass_absolute(
+            Q[i], T[i], T_subseq_isfinite[i], p=p, query_idx=query_idx
+        )
     D = np.mean(D, axis=0)
 
     return core._find_matches(

stumpy/core.py

@@ -1372,7 +1372,7 @@ def mass_absolute(Q, T, T_subseq_isfinite=None, p=2.0, query_idx=None):
 
     check_window_size(m, max_size=Q.shape[0])
 
-    if query_idx is not None:  # pragma: no cover
+    if query_idx is not None:
         query_idx = int(query_idx)
         T_isfinite_idx = np.isfinite(T[query_idx : query_idx + m])
         if not np.all(Q_isfinite == T_isfinite_idx) or not np.allclose(
@@ -1407,7 +1407,7 @@ def mass_absolute(Q, T, T_subseq_isfinite=None, p=2.0, query_idx=None):
         if T_subseq_isfinite is None:
             T, T_subseq_isfinite = preprocess_non_normalized(T, m)
         distance_profile[:] = _mass_absolute(Q, T, p)
-        if query_idx is not None:  # pragma: no cover
+        if query_idx is not None:
             distance_profile[query_idx] = 0.0
 
         distance_profile[~T_subseq_isfinite] = np.inf

tests/test_aamp_motifs.py

@@ -239,3 +239,22 @@ def test_aamp_match_T_subseq_isfinite(Q, T):
         )
 
         npt.assert_almost_equal(left, right)
+
+
+def test_aamp_match_query_idx():
+    T = np.random.uniform(-1000, 1000, [64])
+    m = 8
+    query_idx = 20
+    Q = T[query_idx : query_idx + m]
+
+    # `mass_absolute` zeroes the self-match distance when told where `Q` lives.
+    D = core.mass_absolute(Q, T, query_idx=query_idx)
+    npt.assert_almost_equal(D[query_idx], 0.0)
+
+    # A `Q` that is not the subsequence at `query_idx` must still return the
+    # self-match first, and must warn, exactly as `stumpy.match` does.
+    with pytest.warns(UserWarning):
+        out = aamp_match(Q + 0.5, T, query_idx=query_idx, max_distance=1.0)
+
+    assert out[0, 1] == query_idx
+    npt.assert_almost_equal(out[0, 0], 0.0)