From 3700791021838cced25b8c9dc83c5cbea697e596 Mon Sep 17 00:00:00 2001 From: SolidAhmad Date: Wed, 31 Aug 2022 22:36:15 -0600 Subject: [PATCH 1/2] Fix param s in AB-join mode --- stumpy/scraamp.py | 13 +++++++++---- stumpy/scrump.py | 13 +++++++++---- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/stumpy/scraamp.py b/stumpy/scraamp.py index c6baababe..9da8d9283 100644 --- a/stumpy/scraamp.py +++ b/stumpy/scraamp.py @@ -324,8 +324,11 @@ def prescraamp(T_A, m, T_B=None, s=None, p=2.0): n_A = T_A.shape[0] l = n_A - m + 1 - if s is None: # pragma: no cover - s = excl_zone + if s is None: # pragma: no cover: + if excl_zone is not None: # self-join + s = excl_zone + else: # AB-join + s = int(np.ceil(m / config.STUMPY_EXCL_ZONE_DENOM)) indices = np.random.permutation(range(0, l, s)).astype(np.int64) P, I = _prescraamp( @@ -509,9 +512,11 @@ def __init__( self._I[:, :] = -1 self._excl_zone = int(np.ceil(self._m / config.STUMPY_EXCL_ZONE_DENOM)) - if s is None: - s = self._excl_zone + if self._excl_zone is not None: # self-join + s = self._excl_zone + else: # AB-join + s = int(np.ceil(self._m / config.STUMPY_EXCL_ZONE_DENOM)) if pre_scraamp: if self._ignore_trivial: diff --git a/stumpy/scrump.py b/stumpy/scrump.py index d583e8d73..53ab888de 100644 --- a/stumpy/scrump.py +++ b/stumpy/scrump.py @@ -339,8 +339,11 @@ def prescrump(T_A, m, T_B=None, s=None, normalize=True, p=2.0): n_A = T_A.shape[0] l = n_A - m + 1 - if s is None: # pragma: no cover - s = excl_zone + if s is None: # pragma: no cover: + if excl_zone is not None: # self-join + s = excl_zone + else: # AB-join + s = int(np.ceil(m / config.STUMPY_EXCL_ZONE_DENOM)) indices = np.random.permutation(range(0, l, s)).astype(np.int64) P, I = _prescrump( @@ -578,9 +581,11 @@ def __init__( self._I[:, :] = -1 self._excl_zone = int(np.ceil(self._m / config.STUMPY_EXCL_ZONE_DENOM)) - if s is None: - s = self._excl_zone + if self._excl_zone is not None: # self-join + s = self._excl_zone + else: # AB-join + s = int(np.ceil(self._m / config.STUMPY_EXCL_ZONE_DENOM)) if pre_scrump: if self._ignore_trivial: From 859a3a1fdac069f06537ac4b15a24f881dd25bf7 Mon Sep 17 00:00:00 2001 From: SolidAhmad Date: Thu, 1 Sep 2022 10:43:16 -0600 Subject: [PATCH 2/2] fix coverage --- stumpy/scraamp.py | 4 ++-- stumpy/scrump.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/stumpy/scraamp.py b/stumpy/scraamp.py index 9da8d9283..0f0fc41f2 100644 --- a/stumpy/scraamp.py +++ b/stumpy/scraamp.py @@ -324,7 +324,7 @@ def prescraamp(T_A, m, T_B=None, s=None, p=2.0): n_A = T_A.shape[0] l = n_A - m + 1 - if s is None: # pragma: no cover: + if s is None: # pragma: no cover if excl_zone is not None: # self-join s = excl_zone else: # AB-join @@ -515,7 +515,7 @@ def __init__( if s is None: if self._excl_zone is not None: # self-join s = self._excl_zone - else: # AB-join + else: # pragma: no cover # AB-join s = int(np.ceil(self._m / config.STUMPY_EXCL_ZONE_DENOM)) if pre_scraamp: diff --git a/stumpy/scrump.py b/stumpy/scrump.py index 53ab888de..3ec55ef7c 100644 --- a/stumpy/scrump.py +++ b/stumpy/scrump.py @@ -339,7 +339,7 @@ def prescrump(T_A, m, T_B=None, s=None, normalize=True, p=2.0): n_A = T_A.shape[0] l = n_A - m + 1 - if s is None: # pragma: no cover: + if s is None: # pragma: no cover if excl_zone is not None: # self-join s = excl_zone else: # AB-join @@ -584,7 +584,7 @@ def __init__( if s is None: if self._excl_zone is not None: # self-join s = self._excl_zone - else: # AB-join + else: # pragma: no cover # AB-join s = int(np.ceil(self._m / config.STUMPY_EXCL_ZONE_DENOM)) if pre_scrump: