Skip to content

Commit a15b757

Browse files
committed
update aamp for checking window size
1 parent 643b4b0 commit a15b757

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

stumpy/aamp.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -407,17 +407,17 @@ def aamp(T_A, m, T_B=None, ignore_trivial=True, p=2.0, k=1):
407407
if T_B.ndim != 1: # pragma: no cover
408408
raise ValueError(f"T_B is {T_B.ndim}-dimensional and must be 1-dimensional. ")
409409

410-
core.check_window_size(m, max_size=min(T_A.shape[0], T_B.shape[0]))
411-
ignore_trivial = core.check_ignore_trivial(T_A, T_B, ignore_trivial)
412-
413410
n_A = T_A.shape[0]
414411
n_B = T_B.shape[0]
415412
l = n_A - m + 1
416413

414+
ignore_trivial = core.check_ignore_trivial(T_A, T_B, ignore_trivial)
417415
excl_zone = int(np.ceil(m / config.STUMPY_EXCL_ZONE_DENOM))
418-
if ignore_trivial:
416+
if ignore_trivial: # self-join
417+
core.check_window_size(m, max_size=min(n_A, n_B), n=n_A)
419418
diags = np.arange(excl_zone + 1, n_A - m + 1, dtype=np.int64)
420-
else:
419+
else: # AB-join
420+
core.check_window_size(m, max_size=min(n_A, n_B))
421421
diags = np.arange(-(n_A - m + 1) + 1, n_B - m + 1, dtype=np.int64)
422422

423423
P, PL, PR, I, IL, IR = _aamp(

0 commit comments

Comments
 (0)