Ensure that we respect max_motif

wildboar-foundation · Dec 5, 2022 · 5d4cc5e · 5d4cc5e
1 parent 5064e60
commit 5d4cc5e
Show file tree

Hide file tree

Showing 3 changed files with 57 additions and 22 deletions.
diff --git a/docs/examples/notebooks/annotate/motif.ipynb b/docs/examples/notebooks/annotate/motif.ipynb
diff --git a/docs/more/versions/v1.1.rst b/docs/more/versions/v1.1.rst
@@ -13,6 +13,21 @@ Dependencies
 
 Wildboar 1.1 requires Python 3.8+, numpy 1.17.3+, scipy 1.3.2+ and scikit-learn 1.1+.
 
+Version 1.1.1
+=============
+
+Changelog
+---------
+
+.. grid:: 1
+
+ .. grid-item-card:: 
+
+ :mod:`wildboar.annotate`
+ ^^^
+
+ - |Fix| Correctly return ``max_motif`` motifs from :func:`annotate.motifs`.
+
 
 Version 1.1.0
 =============

diff --git a/src/wildboar/annotate/_motifs.py b/src/wildboar/annotate/_motifs.py
@@ -146,10 +146,8 @@ def motifs(
  motif_index = []
  if callable(max_distance):
  cutoff = max_distance(mp[i])
- for j in range(max_motif):
- if len(motif_index) > max_motif:
- break
 
+ while len(motif_index) < max_motif and not np.all(np.isinf(mp)):
  candidate = np.argmin(mp[i])
  if mp[i, candidate] > cutoff:
  break