Fixed #1014 Fix max_matches=None bug (#1015)

* Fix max_matches=None bug

* Alternate max_matches=None fix

Author: ejorgensen-wl

stumpy/aamp_motifs.py

@@ -268,7 +268,7 @@ def aamp_motifs(
     m = T.shape[-1] - P.shape[-1] + 1
     excl_zone = int(np.ceil(m / config.STUMPY_EXCL_ZONE_DENOM))
     if max_matches is None:  # pragma: no cover
-        max_matches = np.inf
+        max_matches = P.shape[-1]
     if cutoff is None:  # pragma: no cover
         P_copy = P.copy().astype(np.float64)
         P_copy[np.isinf(P_copy)] = np.nan

stumpy/motifs.py

@@ -334,7 +334,7 @@ def motifs(
     m = T.shape[-1] - P.shape[-1] + 1
     excl_zone = int(np.ceil(m / config.STUMPY_EXCL_ZONE_DENOM))
     if max_matches is None:  # pragma: no cover
-        max_matches = np.inf
+        max_matches = P.shape[-1]
     if cutoff is None:  # pragma: no cover
         P_copy = P.copy().astype(np.float64)
         P_copy[np.isinf(P_copy)] = np.nan

tests/test_motifs.py

@@ -656,3 +656,30 @@ def test_motifs_with_isconstant():
 
     npt.assert_almost_equal(ref_distances, comp_distance)
     npt.assert_almost_equal(ref_indices, comp_indices)
+
+
+def test_motifs_with_max_matches_none():
+    T = np.random.rand(16)
+    m = 3
+
+    max_motifs = 1
+    max_matches = None
+    max_distance = np.inf
+    cutoff = np.inf
+
+    # performant
+    mp = naive.stump(T, m, row_wise=True)
+    comp_distance, comp_indices = motifs(
+        T,
+        mp[:, 0].astype(np.float64),
+        min_neighbors=1,
+        max_distance=max_distance,
+        cutoff=cutoff,
+        max_matches=max_matches,
+        max_motifs=max_motifs,
+    )
+
+    ref_len = len(T) - m + 1
+
+    npt.assert_(ref_len >= comp_distance.shape[1])
+    npt.assert_(ref_len >= comp_indices.shape[1])