Skip to content

Commit 73622f2

Browse files
seanlawseanlaw
committed
Fixed multiline warnings
1 parent 589984c commit 73622f2

File tree

14 files changed

+86
-80
lines changed

14 files changed

+86
-80
lines changed

‎stumpy/aamp.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -400,12 +400,14 @@ def aamp(T_A, m, T_B=None, ignore_trivial=True, p=2.0, k=1):
400400
core.check_window_size(m, max_size=min(T_A.shape[0], T_B.shape[0]))
401401

402402
if ignore_trivial is False and core.are_arrays_equal(T_A, T_B): # pragma: no cover
403-
warnings.warn("Arrays T_A, T_B are equal, which implies a self-join.")
404-
warnings.warn("Try setting `ignore_trivial = True`.")
403+
msg = "Arrays T_A, T_B are equal, which implies a self-join.\n"
404+
msg += "Try setting `ignore_trivial = True`."
405+
warnings.warn("msg")
405406

406407
if ignore_trivial and core.are_arrays_equal(T_A, T_B) is False: # pragma: no cover
407-
warnings.warn("Arrays T_A, T_B are not equal, which implies an AB-join.")
408-
warnings.warn("Try setting `ignore_trivial = False`.")
408+
msg = "Arrays T_A, T_B are not equal, which implies an AB-join.\n"
409+
msg += "Try setting `ignore_trivial = False`."
410+
warnings.warn("msg")
409411

410412
n_A = T_A.shape[0]
411413
n_B = T_B.shape[0]

‎stumpy/aamp_mmotifs.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -110,11 +110,10 @@ def aamp_mmotifs(
110110
reset_k = False
111111

112112
if max_motifs < 1: # pragma: no cover
113-
warnings.warn(
114-
"The maximum number of motifs, `max_motifs`, "
115-
"must be greater than or equal to 1"
116-
)
117-
warnings.warn("`max_motifs` has been set to `1`")
113+
msg = "The maximum number of motifs, `max_motifs`, "
114+
msg += "must be greater than or equal to 1.\n"
115+
msg += "`max_motifs` has been set to `1`"
116+
warnings.warn(msg)
118117
max_motifs = 1
119118

120119
T, T_subseq_isfinite = core.preprocess_non_normalized(T, m)

‎stumpy/aamp_motifs.py

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -243,11 +243,10 @@ def aamp_motifs(
243243
244244
"""
245245
if max_motifs < 1: # pragma: no cover
246-
warnings.warn(
247-
"The maximum number of motifs, `max_motifs`, "
248-
"must be greater than or equal to 1"
249-
)
250-
warnings.warn("`max_motifs` has been set to `1`")
246+
msg = "The maximum number of motifs, `max_motifs`, "
247+
msg += "must be greater than or equal to 1.\n"
248+
msg += "`max_motifs` has been set to `1`"
249+
warnings.warn(msg)
251250
max_motifs = 1
252251

253252
if T.ndim != 1: # pragma: no cover
@@ -275,14 +274,11 @@ def aamp_motifs(
275274

276275
if cutoff == 0.0: # pragma: no cover
277276
suggested_cutoff = np.partition(P, 1)[1]
278-
warnings.warn(
279-
"The `cutoff` has been set to 0.0 and may result in little/no candidate "
280-
"motifs being identified."
281-
)
282-
warnings.warn(
283-
"You may consider relaxing the constraint by increasing the `cutoff` "
284-
f"(e.g., cutoff={suggested_cutoff})."
285-
)
277+
msg = "The `cutoff` has been set to 0.0 and may result in little/no candidate "
278+
msg += "motifs being identified.\n"
279+
msg += "You may consider relaxing the constraint by increasing the `cutoff` "
280+
msg += f"(e.g., cutoff={suggested_cutoff})."
281+
warnings.warn(msg)
286282

287283
T, T_subseq_isfinite = core.preprocess_non_normalized(T[np.newaxis, :], m)
288284
P = P[np.newaxis, :].astype(np.float64)

‎stumpy/aamped.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,12 +89,14 @@ def aamped(dask_client, T_A, m, T_B=None, ignore_trivial=True, p=2.0, k=1):
8989
core.check_window_size(m, max_size=min(T_A.shape[0], T_B.shape[0]))
9090

9191
if ignore_trivial is False and core.are_arrays_equal(T_A, T_B): # pragma: no cover
92-
warnings.warn("Arrays T_A, T_B are equal, which implies a self-join.")
93-
warnings.warn("Try setting `ignore_trivial = True`.")
92+
msg = "Arrays T_A, T_B are equal, which implies a self-join.\n"
93+
msg += "Try setting `ignore_trivial = True`."
94+
warnings.warn(msg)
9495

9596
if ignore_trivial and core.are_arrays_equal(T_A, T_B) is False: # pragma: no cover
96-
warnings.warn("Arrays T_A, T_B are not equal, which implies an AB-join.")
97-
warnings.warn("Try setting `ignore_trivial = False`.")
97+
msg = "Arrays T_A, T_B are not equal, which implies an AB-join.\n"
98+
msg += "Try setting `ignore_trivial = False`."
99+
warnings.warn(msg)
98100

99101
n_A = T_A.shape[0]
100102
n_B = T_B.shape[0]

‎stumpy/core.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2804,8 +2804,9 @@ def _check_P(P, threshold=1e-6):
28042804
if P.ndim != 1:
28052805
raise ValueError("`P` was {P.ndim}-dimensional and must be 1-dimensional")
28062806
if are_distances_too_small(P, threshold=threshold): # pragma: no cover
2807-
warnings.warn(f"A large number of values in `P` are smaller than {threshold}.")
2808-
warnings.warn("For a self-join, try setting `ignore_trivial=True`.")
2807+
msg = f"A large number of values in `P` are smaller than {threshold}.\n"
2808+
msg += "For a self-join, try setting `ignore_trivial=True`."
2809+
warnings.warn(msg)
28092810

28102811

28112812
def _find_matches(

‎stumpy/gpu_aamp.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -526,12 +526,14 @@ def gpu_aamp(T_A, m, T_B=None, ignore_trivial=True, device_id=0, p=2.0, k=1):
526526
core.check_window_size(m, max_size=min(T_A.shape[0], T_B.shape[0]))
527527

528528
if ignore_trivial is False and core.are_arrays_equal(T_A, T_B): # pragma: no cover
529-
warnings.warn("Arrays T_A, T_B are equal, which implies a self-join.")
530-
warnings.warn("Try setting `ignore_trivial = True`.")
529+
msg = "Arrays T_A, T_B are equal, which implies a self-join.\n"
530+
msg += "Try setting `ignore_trivial = True`."
531+
warnings.warn(msg)
531532

532533
if ignore_trivial and core.are_arrays_equal(T_A, T_B) is False: # pragma: no cover
533-
warnings.warn("Arrays T_A, T_B are not equal, which implies an AB-join.")
534-
warnings.warn("Try setting `ignore_trivial = False`.")
534+
msg = "Arrays T_A, T_B are not equal, which implies an AB-join.\n"
535+
msg += "Try setting `ignore_trivial = False`."
536+
warnings.warn(msg)
535537

536538
n = T_B.shape[0]
537539
w = T_A.shape[0] - m + 1

‎stumpy/gpu_stump.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -593,12 +593,14 @@ def gpu_stump(
593593
core.check_window_size(m, max_size=min(T_A.shape[0], T_B.shape[0]))
594594

595595
if ignore_trivial is False and core.are_arrays_equal(T_A, T_B): # pragma: no cover
596-
warnings.warn("Arrays T_A, T_B are equal, which implies a self-join.")
597-
warnings.warn("Try setting `ignore_trivial = True`.")
596+
msg = "Arrays T_A, T_B are equal, which implies a self-join.\n"
597+
msg += "Try setting `ignore_trivial = True`."
598+
warnings.warn(msg)
598599

599600
if ignore_trivial and core.are_arrays_equal(T_A, T_B) is False: # pragma: no cover
600-
warnings.warn("Arrays T_A, T_B are not equal, which implies an AB-join.")
601-
warnings.warn("Try setting `ignore_trivial = False`.")
601+
msg = "Arrays T_A, T_B are not equal, which implies an AB-join.\n"
602+
msg += "Try setting `ignore_trivial = False`."
603+
warnings.warn(msg)
602604

603605
n = T_B.shape[0]
604606
w = T_A.shape[0] - m + 1

‎stumpy/mmotifs.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -128,11 +128,10 @@ def mmotifs(
128128
reset_k = False
129129

130130
if max_motifs < 1: # pragma: no cover
131-
warnings.warn(
132-
"The maximum number of motifs, `max_motifs`, "
133-
"must be greater than or equal to 1"
134-
)
135-
warnings.warn("`max_motifs` has been set to `1`")
131+
msg = "The maximum number of motifs, `max_motifs`, "
132+
msg += "must be greater than or equal to 1.\n"
133+
msg += "`max_motifs` has been set to `1`"
134+
warnings.warn(msg)
136135
max_motifs = 1
137136

138137
T, M_T, Σ_T = core.preprocess(T, m)

‎stumpy/motifs.py

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -270,11 +270,10 @@ def motifs(
270270
T = core._preprocess(T)
271271

272272
if max_motifs < 1: # pragma: no cover
273-
warnings.warn(
274-
"The maximum number of motifs, `max_motifs`, "
275-
"must be greater than or equal to 1"
276-
)
277-
warnings.warn("`max_motifs` has been set to `1`")
273+
msg = "The maximum number of motifs, `max_motifs`, "
274+
msg += "must be greater than or equal to 1.\n"
275+
msg += "`max_motifs` has been set to `1`"
276+
warnings.warn(msg)
278277
max_motifs = 1
279278

280279
if T.ndim != 1: # pragma: no cover
@@ -302,14 +301,11 @@ def motifs(
302301

303302
if cutoff == 0.0: # pragma: no cover
304303
suggested_cutoff = np.partition(P, 1)[1]
305-
warnings.warn(
306-
"The `cutoff` has been set to 0.0 and may result in little/no candidate "
307-
"motifs being identified."
308-
)
309-
warnings.warn(
310-
"You may consider relaxing the constraint by increasing the `cutoff` "
311-
f"(e.g., cutoff={suggested_cutoff})."
312-
)
304+
msg = "The `cutoff` has been set to 0.0 and may result in little/no candidate "
305+
msg += "motifs being identified.\n"
306+
msg += "You may consider relaxing the constraint by increasing the `cutoff` "
307+
msg += f"(e.g., cutoff={suggested_cutoff})."
308+
warnings.warn(msg)
313309

314310
T, M_T, Σ_T = core.preprocess(T[np.newaxis, :], m)
315311
P = P[np.newaxis, :].astype(np.float64)

‎stumpy/scraamp.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -652,15 +652,17 @@ def __init__(
652652
if self._ignore_trivial is False and core.are_arrays_equal(
653653
self._T_A, self._T_B
654654
): # pragma: no cover
655-
warnings.warn("Arrays T_A, T_B are equal, which implies a self-join.")
656-
warnings.warn("Try setting `ignore_trivial = True`.")
655+
msg = "Arrays T_A, T_B are equal, which implies a self-join.\n"
656+
msg += "Try setting `ignore_trivial = True`."
657+
warnings.warn(msg)
657658

658659
if (
659660
self._ignore_trivial
660661
and core.are_arrays_equal(self._T_A, self._T_B) is False
661662
): # pragma: no cover
662-
warnings.warn("Arrays T_A, T_B are not equal, which implies an AB-join.")
663-
warnings.warn("Try setting `ignore_trivial = False`.")
663+
msg = "Arrays T_A, T_B are not equal, which implies an AB-join.\n"
664+
msg += "Try setting `ignore_trivial = False`."
665+
warnings.warn(msg)
664666

665667
self._n_A = self._T_A.shape[0]
666668
self._n_B = self._T_B.shape[0]

‎stumpy/scrump.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -747,15 +747,17 @@ def __init__(
747747
if self._ignore_trivial is False and core.are_arrays_equal(
748748
self._T_A, self._T_B
749749
): # pragma: no cover
750-
warnings.warn("Arrays T_A, T_B are equal, which implies a self-join.")
751-
warnings.warn("Try setting `ignore_trivial = True`.")
750+
msg = "Arrays T_A, T_B are equal, which implies a self-join.\n"
751+
msg += "Try setting `ignore_trivial = True`."
752+
warnings.warn(msg)
752753

753754
if (
754755
self._ignore_trivial
755756
and core.are_arrays_equal(self._T_A, self._T_B) is False
756757
): # pragma: no cover
757-
warnings.warn("Arrays T_A, T_B are not equal, which implies an AB-join.")
758-
warnings.warn("Try setting `ignore_trivial = False`.")
758+
msg = "Arrays T_A, T_B are not equal, which implies an AB-join.\n"
759+
msg += "Try setting `ignore_trivial = False`."
760+
warnings.warn(msg)
759761

760762
self._n_A = self._T_A.shape[0]
761763
self._n_B = self._T_B.shape[0]

‎stumpy/stomp.py

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,9 @@ def _stomp(T_A, m, T_B=None, ignore_trivial=True):
6464
6565
Note that left and right matrix profiles are only available for self-joins.
6666
"""
67-
warnings.warn(
68-
"stumpy.stomp._stomp is not supported and only provided for reference."
69-
)
70-
warnings.warn(
71-
"Please use the Numba JIT-compiled stumpy.stump or stumpy.gpu_stump instead."
72-
)
67+
msg = "stumpy.stomp._stomp is not supported and only provided for reference.\n"
68+
msg += "Please use the Numba JIT-compiled stumpy.stump or stumpy.gpu_stump instead."
69+
warnings.warn(msg)
7370

7471
if T_B is None:
7572
T_B = T_A
@@ -87,12 +84,14 @@ def _stomp(T_A, m, T_B=None, ignore_trivial=True):
8784
core.check_window_size(m, max_size=min(T_A.shape[0], T_B.shape[0]))
8885

8986
if ignore_trivial is False and core.are_arrays_equal(T_A, T_B): # pragma: no cover
90-
warnings.warn("Arrays T_A, T_B are equal, which implies a self-join.")
91-
warnings.warn("Try setting `ignore_trivial = True`.")
87+
msg = "Arrays T_A, T_B are equal, which implies a self-join.\n"
88+
msg += "Try setting `ignore_trivial = True`."
89+
warnings.warn(msg)
9290

9391
if ignore_trivial and core.are_arrays_equal(T_A, T_B) is False: # pragma: no cover
94-
warnings.warn("Arrays T_A, T_B are not equal, which implies an AB-join.")
95-
warnings.warn("Try setting `ignore_trivial = False`.")
92+
msg = "Arrays T_A, T_B are not equal, which implies an AB-join.\n"
93+
msg += "Try setting `ignore_trivial = False`."
94+
warnings.warn(msg)
9695

9796
n = T_A.shape[0]
9897
l = n - m + 1

‎stumpy/stump.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -666,12 +666,14 @@ def stump(T_A, m, T_B=None, ignore_trivial=True, normalize=True, p=2.0, k=1):
666666
core.check_window_size(m, max_size=min(T_A.shape[0], T_B.shape[0]))
667667

668668
if ignore_trivial is False and core.are_arrays_equal(T_A, T_B): # pragma: no cover
669-
warnings.warn("Arrays T_A, T_B are equal, which implies a self-join.")
670-
warnings.warn("Try setting `ignore_trivial = True`.")
669+
msg = "Arrays T_A, T_B are equal, which implies a self-join.\n"
670+
msg += "Try setting `ignore_trivial = True`."
671+
warnings.warn(msg)
671672

672673
if ignore_trivial and core.are_arrays_equal(T_A, T_B) is False: # pragma: no cover
673-
warnings.warn("Arrays T_A, T_B are not equal, which implies an AB-join.")
674-
warnings.warn("Try setting `ignore_trivial = False`.")
674+
msg = "Arrays T_A, T_B are not equal, which implies an AB-join.\n"
675+
msg += "Try setting `ignore_trivial = False`."
676+
warnings.warn(msg)
675677

676678
n_A = T_A.shape[0]
677679
n_B = T_B.shape[0]

‎stumpy/stumped.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -183,12 +183,14 @@ def stumped(
183183
core.check_window_size(m, max_size=min(T_A.shape[0], T_B.shape[0]))
184184

185185
if ignore_trivial is False and core.are_arrays_equal(T_A, T_B): # pragma: no cover
186-
warnings.warn("Arrays T_A, T_B are equal, which implies a self-join.")
187-
warnings.warn("Try setting `ignore_trivial = True`.")
186+
msg = "Arrays T_A, T_B are equal, which implies a self-join.\n"
187+
msg += "Try setting `ignore_trivial = True`."
188+
warnings.warn(msg)
188189

189190
if ignore_trivial and core.are_arrays_equal(T_A, T_B) is False: # pragma: no cover
190-
warnings.warn("Arrays T_A, T_B are not equal, which implies an AB-join.")
191-
warnings.warn("Try setting `ignore_trivial = False`.")
191+
msg = "Arrays T_A, T_B are not equal, which implies an AB-join.\n"
192+
msg += "Try setting `ignore_trivial = False`."
193+
warnings.warn(msg)
192194

193195
n_A = T_A.shape[0]
194196
n_B = T_B.shape[0]

0 commit comments

Comments
 (0)