Skip to content

Commit ea379cb

Browse files
sergiobujsergiobuj
authored
Fixed #235 Replaced left/right with ref/comp in tests
This change for the variable naming is proposed in #235.
1 parent 0d327b2 commit ea379cb

31 files changed

Lines changed: 768 additions & 768 deletions

‎tests/test_aamp.py‎

Lines changed: 95 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -28,65 +28,65 @@ def test_aamp_int_input():
2828
@pytest.mark.parametrize("T_A, T_B", test_data)
2929
def test_aamp_self_join(T_A, T_B):
3030
m = 3
31-
left = naive.aamp(T_B, m)
32-
right = aamp(T_B, m)
33-
naive.replace_inf(left)
34-
naive.replace_inf(right)
35-
npt.assert_almost_equal(left, right)
31+
ref_mp = naive.aamp(T_B, m)
32+
comp_mp = aamp(T_B, m)
33+
naive.replace_inf(ref_mp)
34+
naive.replace_inf(comp_mp)
35+
npt.assert_almost_equal(ref_mp, comp_mp)
3636

37-
right = aamp(pd.Series(T_B), m)
38-
naive.replace_inf(right)
39-
npt.assert_almost_equal(left, right)
37+
comp_mp = aamp(pd.Series(T_B), m)
38+
naive.replace_inf(comp_mp)
39+
npt.assert_almost_equal(ref_mp, comp_mp)
4040

4141

4242
@pytest.mark.parametrize("T_A, T_B", test_data)
4343
def test_aamp_A_B_join(T_A, T_B):
4444
m = 3
45-
left = naive.aamp(T_A, m, T_B=T_B)
46-
right = aamp(T_A, m, T_B, ignore_trivial=False)
47-
naive.replace_inf(left)
48-
naive.replace_inf(right)
49-
npt.assert_almost_equal(left, right)
45+
ref_mp = naive.aamp(T_A, m, T_B=T_B)
46+
comp_mp = aamp(T_A, m, T_B, ignore_trivial=False)
47+
naive.replace_inf(ref_mp)
48+
naive.replace_inf(comp_mp)
49+
npt.assert_almost_equal(ref_mp, comp_mp)
5050

51-
right = aamp(pd.Series(T_A), m, pd.Series(T_B), ignore_trivial=False)
52-
naive.replace_inf(right)
53-
npt.assert_almost_equal(left, right)
51+
comp_mp = aamp(pd.Series(T_A), m, pd.Series(T_B), ignore_trivial=False)
52+
naive.replace_inf(comp_mp)
53+
npt.assert_almost_equal(ref_mp, comp_mp)
5454

5555

5656
def test_aamp_constant_subsequence_self_join():
5757
T_A = np.concatenate((np.zeros(20, dtype=np.float64), np.ones(5, dtype=np.float64)))
5858
m = 3
59-
left = naive.aamp(T_A, m)
60-
right = aamp(T_A, m, ignore_trivial=True)
61-
naive.replace_inf(left)
62-
naive.replace_inf(right)
63-
npt.assert_almost_equal(left[:, 0], right[:, 0]) # ignore indices
59+
ref_mp = naive.aamp(T_A, m)
60+
comp_mp = aamp(T_A, m, ignore_trivial=True)
61+
naive.replace_inf(ref_mp)
62+
naive.replace_inf(comp_mp)
63+
npt.assert_almost_equal(ref_mp[:, 0], comp_mp[:, 0]) # ignore indices
6464

65-
right = aamp(pd.Series(T_A), m, ignore_trivial=True)
66-
naive.replace_inf(right)
67-
npt.assert_almost_equal(left[:, 0], right[:, 0]) # ignore indices
65+
comp_mp = aamp(pd.Series(T_A), m, ignore_trivial=True)
66+
naive.replace_inf(comp_mp)
67+
npt.assert_almost_equal(ref_mp[:, 0], comp_mp[:, 0]) # ignore indices
6868

6969

7070
def test_aamp_one_constant_subsequence_A_B_join():
7171
T_A = np.random.rand(20)
7272
T_B = np.concatenate((np.zeros(20, dtype=np.float64), np.ones(5, dtype=np.float64)))
7373
m = 3
74-
left = naive.aamp(T_A, m, T_B=T_B)
75-
right = aamp(T_A, m, T_B, ignore_trivial=False)
76-
naive.replace_inf(left)
77-
naive.replace_inf(right)
78-
npt.assert_almost_equal(left[:, 0], right[:, 0]) # ignore indices
74+
ref_mp = naive.aamp(T_A, m, T_B=T_B)
75+
comp_mp = aamp(T_A, m, T_B, ignore_trivial=False)
76+
naive.replace_inf(ref_mp)
77+
naive.replace_inf(comp_mp)
78+
npt.assert_almost_equal(ref_mp[:, 0], comp_mp[:, 0]) # ignore indices
7979

80-
right = aamp(pd.Series(T_A), m, pd.Series(T_B), ignore_trivial=False)
81-
naive.replace_inf(right)
82-
npt.assert_almost_equal(left[:, 0], right[:, 0]) # ignore indices
80+
comp_mp = aamp(pd.Series(T_A), m, pd.Series(T_B), ignore_trivial=False)
81+
naive.replace_inf(comp_mp)
82+
npt.assert_almost_equal(ref_mp[:, 0], comp_mp[:, 0]) # ignore indices
8383

8484
# Swap inputs
85-
left = naive.aamp(T_B, m, T_B=T_A)
86-
right = aamp(T_B, m, T_A, ignore_trivial=False)
87-
naive.replace_inf(left)
88-
naive.replace_inf(right)
89-
npt.assert_almost_equal(left[:, 0], right[:, 0]) # ignore indices
85+
ref_mp = naive.aamp(T_B, m, T_B=T_A)
86+
comp_mp = aamp(T_B, m, T_A, ignore_trivial=False)
87+
naive.replace_inf(ref_mp)
88+
naive.replace_inf(comp_mp)
89+
npt.assert_almost_equal(ref_mp[:, 0], comp_mp[:, 0]) # ignore indices
9090

9191

9292
def test_aamp_two_constant_subsequences_A_B_join():
@@ -95,26 +95,26 @@ def test_aamp_two_constant_subsequences_A_B_join():
9595
)
9696
T_B = np.concatenate((np.zeros(20, dtype=np.float64), np.ones(5, dtype=np.float64)))
9797
m = 3
98-
left = naive.aamp(T_A, m, T_B=T_B)
99-
right = aamp(T_A, m, T_B, ignore_trivial=False)
100-
naive.replace_inf(left)
101-
naive.replace_inf(right)
102-
npt.assert_almost_equal(left[:, 0], right[:, 0]) # ignore indices
98+
ref_mp = naive.aamp(T_A, m, T_B=T_B)
99+
comp_mp = aamp(T_A, m, T_B, ignore_trivial=False)
100+
naive.replace_inf(ref_mp)
101+
naive.replace_inf(comp_mp)
102+
npt.assert_almost_equal(ref_mp[:, 0], comp_mp[:, 0]) # ignore indices
103103

104-
right = aamp(pd.Series(T_A), m, pd.Series(T_B), ignore_trivial=False)
105-
naive.replace_inf(right)
106-
npt.assert_almost_equal(left[:, 0], right[:, 0]) # ignore indices
104+
comp_mp = aamp(pd.Series(T_A), m, pd.Series(T_B), ignore_trivial=False)
105+
naive.replace_inf(comp_mp)
106+
npt.assert_almost_equal(ref_mp[:, 0], comp_mp[:, 0]) # ignore indices
107107

108108
# Swap inputs
109-
left = naive.aamp(T_B, m, T_B=T_A)
110-
right = aamp(T_B, m, T_A, ignore_trivial=False)
111-
naive.replace_inf(left)
112-
naive.replace_inf(right)
113-
npt.assert_almost_equal(left[:, 0], right[:, 0]) # ignore indices
109+
ref_mp = naive.aamp(T_B, m, T_B=T_A)
110+
comp_mp = aamp(T_B, m, T_A, ignore_trivial=False)
111+
naive.replace_inf(ref_mp)
112+
naive.replace_inf(comp_mp)
113+
npt.assert_almost_equal(ref_mp[:, 0], comp_mp[:, 0]) # ignore indices
114114

115-
right = aamp(pd.Series(T_B), m, pd.Series(T_A), ignore_trivial=False)
116-
naive.replace_inf(right)
117-
npt.assert_almost_equal(left[:, 0], right[:, 0]) # ignore indices
115+
comp_mp = aamp(pd.Series(T_B), m, pd.Series(T_A), ignore_trivial=False)
116+
naive.replace_inf(comp_mp)
117+
npt.assert_almost_equal(ref_mp[:, 0], comp_mp[:, 0]) # ignore indices
118118

119119

120120
def test_aamp_identical_subsequence_self_join():
@@ -123,18 +123,18 @@ def test_aamp_identical_subsequence_self_join():
123123
T_A[1 : 1 + identical.shape[0]] = identical
124124
T_A[11 : 11 + identical.shape[0]] = identical
125125
m = 3
126-
left = naive.aamp(T_A, m)
127-
right = aamp(T_A, m, ignore_trivial=True)
128-
naive.replace_inf(left)
129-
naive.replace_inf(right)
126+
ref_mp = naive.aamp(T_A, m)
127+
comp_mp = aamp(T_A, m, ignore_trivial=True)
128+
naive.replace_inf(ref_mp)
129+
naive.replace_inf(comp_mp)
130130
npt.assert_almost_equal(
131-
left[:, 0], right[:, 0], decimal=config.STUMPY_TEST_PRECISION
131+
ref_mp[:, 0], comp_mp[:, 0], decimal=config.STUMPY_TEST_PRECISION
132132
) # ignore indices
133133

134-
right = aamp(pd.Series(T_A), m, ignore_trivial=True)
135-
naive.replace_inf(right)
134+
comp_mp = aamp(pd.Series(T_A), m, ignore_trivial=True)
135+
naive.replace_inf(comp_mp)
136136
npt.assert_almost_equal(
137-
left[:, 0], right[:, 0], decimal=config.STUMPY_TEST_PRECISION
137+
ref_mp[:, 0], comp_mp[:, 0], decimal=config.STUMPY_TEST_PRECISION
138138
) # ignore indices
139139

140140

@@ -145,27 +145,27 @@ def test_aamp_identical_subsequence_A_B_join():
145145
T_A[1 : 1 + identical.shape[0]] = identical
146146
T_B[11 : 11 + identical.shape[0]] = identical
147147
m = 3
148-
left = naive.aamp(T_A, m, T_B=T_B)
149-
right = aamp(T_A, m, T_B, ignore_trivial=False)
150-
naive.replace_inf(left)
151-
naive.replace_inf(right)
148+
ref_mp = naive.aamp(T_A, m, T_B=T_B)
149+
comp_mp = aamp(T_A, m, T_B, ignore_trivial=False)
150+
naive.replace_inf(ref_mp)
151+
naive.replace_inf(comp_mp)
152152
npt.assert_almost_equal(
153-
left[:, 0], right[:, 0], config.STUMPY_TEST_PRECISION
153+
ref_mp[:, 0], comp_mp[:, 0], config.STUMPY_TEST_PRECISION
154154
) # ignore indices
155155

156-
right = aamp(pd.Series(T_A), m, pd.Series(T_B), ignore_trivial=False)
157-
naive.replace_inf(right)
156+
comp_mp = aamp(pd.Series(T_A), m, pd.Series(T_B), ignore_trivial=False)
157+
naive.replace_inf(comp_mp)
158158
npt.assert_almost_equal(
159-
left[:, 0], right[:, 0], config.STUMPY_TEST_PRECISION
159+
ref_mp[:, 0], comp_mp[:, 0], config.STUMPY_TEST_PRECISION
160160
) # ignore indices
161161

162162
# Swap inputs
163-
left = naive.aamp(T_B, m, T_B=T_A)
164-
right = aamp(T_B, m, T_A, ignore_trivial=False)
165-
naive.replace_inf(left)
166-
naive.replace_inf(right)
163+
ref_mp = naive.aamp(T_B, m, T_B=T_A)
164+
comp_mp = aamp(T_B, m, T_A, ignore_trivial=False)
165+
naive.replace_inf(ref_mp)
166+
naive.replace_inf(comp_mp)
167167
npt.assert_almost_equal(
168-
left[:, 0], right[:, 0], config.STUMPY_TEST_PRECISION
168+
ref_mp[:, 0], comp_mp[:, 0], config.STUMPY_TEST_PRECISION
169169
) # ignore indices
170170

171171

@@ -182,15 +182,15 @@ def test_aamp_nan_inf_self_join(T_A, T_B, substitute_B, substitution_locations):
182182
T_B_sub[substitution_location_B] = substitute_B
183183

184184
zone = int(np.ceil(m / 4))
185-
left = naive.aamp(T_B_sub, m)
186-
right = aamp(T_B_sub, m, ignore_trivial=True)
187-
naive.replace_inf(left)
188-
naive.replace_inf(right)
189-
npt.assert_almost_equal(left, right)
185+
ref_mp = naive.aamp(T_B_sub, m)
186+
comp_mp = aamp(T_B_sub, m, ignore_trivial=True)
187+
naive.replace_inf(ref_mp)
188+
naive.replace_inf(comp_mp)
189+
npt.assert_almost_equal(ref_mp, comp_mp)
190190

191-
right = aamp(pd.Series(T_B_sub), m, ignore_trivial=True)
192-
naive.replace_inf(right)
193-
npt.assert_almost_equal(left, right)
191+
comp_mp = aamp(pd.Series(T_B_sub), m, ignore_trivial=True)
192+
naive.replace_inf(comp_mp)
193+
npt.assert_almost_equal(ref_mp, comp_mp)
194194

195195

196196
@pytest.mark.parametrize("T_A, T_B", test_data)
@@ -212,27 +212,27 @@ def test_aamp_nan_inf_A_B_join(
212212
T_A_sub[substitution_location_A] = substitute_A
213213
T_B_sub[substitution_location_B] = substitute_B
214214

215-
left = naive.aamp(T_A_sub, m, T_B=T_B_sub)
216-
right = aamp(T_A_sub, m, T_B_sub, ignore_trivial=False)
217-
naive.replace_inf(left)
218-
naive.replace_inf(right)
219-
npt.assert_almost_equal(left, right)
215+
ref_mp = naive.aamp(T_A_sub, m, T_B=T_B_sub)
216+
comp_mp = aamp(T_A_sub, m, T_B_sub, ignore_trivial=False)
217+
naive.replace_inf(ref_mp)
218+
naive.replace_inf(comp_mp)
219+
npt.assert_almost_equal(ref_mp, comp_mp)
220220

221-
right = aamp(
221+
comp_mp = aamp(
222222
pd.Series(T_A_sub), m, pd.Series(T_B_sub), ignore_trivial=False
223223
)
224-
naive.replace_inf(right)
225-
npt.assert_almost_equal(left, right)
224+
naive.replace_inf(comp_mp)
225+
npt.assert_almost_equal(ref_mp, comp_mp)
226226

227227

228228
def test_aamp_nan_zero_mean_self_join():
229229
T = np.array([-1, 0, 1, np.inf, 1, 0, -1])
230230
m = 3
231231

232232
zone = int(np.ceil(m / 4))
233-
left = naive.aamp(T, m)
234-
right = aamp(T, m, ignore_trivial=True)
233+
ref_mp = naive.aamp(T, m)
234+
comp_mp = aamp(T, m, ignore_trivial=True)
235235

236-
naive.replace_inf(left)
237-
naive.replace_inf(right)
238-
npt.assert_almost_equal(left, right)
236+
naive.replace_inf(ref_mp)
237+
naive.replace_inf(comp_mp)
238+
npt.assert_almost_equal(ref_mp, comp_mp)

‎tests/test_aamped.py‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@ def test_aamp_int_input(dask_cluster):
4343
def test_aamped_self_join(T_A, T_B, dask_cluster):
4444
with Client(dask_cluster) as dask_client:
4545
m = 3
46-
left = naive.aamp(T_B, m)
47-
right = aamped(dask_client, T_B, m)
48-
naive.replace_inf(left)
49-
naive.replace_inf(right)
50-
npt.assert_almost_equal(left, right)
46+
ref_mp = naive.aamp(T_B, m)
47+
comp_mp = aamped(dask_client, T_B, m)
48+
naive.replace_inf(ref_mp)
49+
naive.replace_inf(comp_mp)
50+
npt.assert_almost_equal(ref_mp, comp_mp)
5151

5252

5353
@pytest.mark.filterwarnings("ignore:numpy.dtype size changed")
@@ -58,11 +58,11 @@ def test_aamped_self_join(T_A, T_B, dask_cluster):
5858
def test_aamped_self_join_df(T_A, T_B, dask_cluster):
5959
with Client(dask_cluster) as dask_client:
6060
m = 3
61-
left = naive.aamp(T_B, m)
62-
right = aamped(dask_client, pd.Series(T_B), m)
63-
naive.replace_inf(left)
64-
naive.replace_inf(right)
65-
npt.assert_almost_equal(left, right)
61+
ref_mp = naive.aamp(T_B, m)
62+
comp_mp = aamped(dask_client, pd.Series(T_B), m)
63+
naive.replace_inf(ref_mp)
64+
naive.replace_inf(comp_mp)
65+
npt.assert_almost_equal(ref_mp, comp_mp)
6666

6767

6868
@pytest.mark.filterwarnings("ignore:numpy.dtype size changed")
@@ -74,12 +74,12 @@ def test_aamped_self_join_df(T_A, T_B, dask_cluster):
7474
def test_aamped_self_join_larger_window(T_A, T_B, m, dask_cluster):
7575
with Client(dask_cluster) as dask_client:
7676
if len(T_B) > m:
77-
left = naive.aamp(T_B, m)
78-
right = aamped(dask_client, T_B, m)
79-
naive.replace_inf(left)
80-
naive.replace_inf(right)
77+
ref_mp = naive.aamp(T_B, m)
78+
comp_mp = aamped(dask_client, T_B, m)
79+
naive.replace_inf(ref_mp)
80+
naive.replace_inf(comp_mp)
8181

82-
npt.assert_almost_equal(left, right)
82+
npt.assert_almost_equal(ref_mp, comp_mp)
8383

8484

8585
@pytest.mark.filterwarnings("ignore:numpy.dtype size changed")
@@ -91,12 +91,12 @@ def test_aamped_self_join_larger_window(T_A, T_B, m, dask_cluster):
9191
def test_aamped_self_join_larger_window_df(T_A, T_B, m, dask_cluster):
9292
with Client(dask_cluster) as dask_client:
9393
if len(T_B) > m:
94-
left = naive.aamp(T_B, m)
95-
right = aamped(dask_client, pd.Series(T_B), m)
96-
naive.replace_inf(left)
97-
naive.replace_inf(right)
94+
ref_mp = naive.aamp(T_B, m)
95+
comp_mp = aamped(dask_client, pd.Series(T_B), m)
96+
naive.replace_inf(ref_mp)
97+
naive.replace_inf(comp_mp)
9898

99-
npt.assert_almost_equal(left, right)
99+
npt.assert_almost_equal(ref_mp, comp_mp)
100100

101101

102102
@pytest.mark.filterwarnings("ignore:numpy.dtype size changed")
@@ -107,11 +107,11 @@ def test_aamped_self_join_larger_window_df(T_A, T_B, m, dask_cluster):
107107
def test_aamped_A_B_join(T_A, T_B, dask_cluster):
108108
with Client(dask_cluster) as dask_client:
109109
m = 3
110-
left = naive.aamp(T_A, m, T_B=T_B)
111-
right = aamped(dask_client, T_A, m, T_B, ignore_trivial=False)
112-
naive.replace_inf(left)
113-
naive.replace_inf(right)
114-
npt.assert_almost_equal(left, right)
110+
ref_mp = naive.aamp(T_A, m, T_B=T_B)
111+
comp_mp = aamped(dask_client, T_A, m, T_B, ignore_trivial=False)
112+
naive.replace_inf(ref_mp)
113+
naive.replace_inf(comp_mp)
114+
npt.assert_almost_equal(ref_mp, comp_mp)
115115

116116

117117
@pytest.mark.filterwarnings("ignore:numpy.dtype size changed")
@@ -122,10 +122,10 @@ def test_aamped_A_B_join(T_A, T_B, dask_cluster):
122122
def test_aamped_A_B_join_df(T_A, T_B, dask_cluster):
123123
with Client(dask_cluster) as dask_client:
124124
m = 3
125-
left = naive.aamp(T_A, m, T_B=T_B)
126-
right = aamped(
125+
ref_mp = naive.aamp(T_A, m, T_B=T_B)
126+
comp_mp = aamped(
127127
dask_client, pd.Series(T_A), m, pd.Series(T_B), ignore_trivial=False
128128
)
129-
naive.replace_inf(left)
130-
naive.replace_inf(right)
131-
npt.assert_almost_equal(left, right)
129+
naive.replace_inf(ref_mp)
130+
naive.replace_inf(comp_mp)
131+
npt.assert_almost_equal(ref_mp, comp_mp)

0 commit comments

Comments
 (0)