Skip to content

Fixed #1175 Migrate tests/test_aamp_ostinato.py to npt.assert_allclose #1182

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
seanlaw merged 1 commit into from
Aug 14, 2026
+46 −41
Merged

Fixed #1175 Migrate tests/test_aamp_ostinato.py to npt.assert_allclose #1182

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
87 changes: 46 additions & 41 deletions tests/test_aamp_ostinato.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@ def test_random_ostinato(runs):
Ts = [rng.RNG.rand(n) for n in [64, 128, 256]]

ref_radius, ref_Ts_idx, ref_subseq_idx = naive.aamp_ostinato(Ts, m)
comp_radius, comp_Ts_idx, comp_subseq_idx = aamp_ostinato(Ts, m)
cmp_radius, cmp_Ts_idx, cmp_subseq_idx = aamp_ostinato(Ts, m)

npt.assert_almost_equal(ref_radius, comp_radius)
npt.assert_almost_equal(ref_Ts_idx, comp_Ts_idx)
npt.assert_almost_equal(ref_subseq_idx, comp_subseq_idx)
npt.assert_allclose(cmp_radius, ref_radius, atol=1.5e-07)
npt.assert_allclose(cmp_Ts_idx, ref_Ts_idx, atol=1.5e-07)
npt.assert_allclose(cmp_subseq_idx, ref_subseq_idx, atol=1.5e-07)


@pytest.mark.parametrize("seed", [41, 88, 290, 292, 310, 328, 538, 556, 563, 570])
Expand All @@ -47,11 +47,11 @@ def test_deterministic_ostinato(seed):

for p in [1.0, 2.0, 3.0]:
ref_radius, ref_Ts_idx, ref_subseq_idx = naive.aamp_ostinato(Ts, m, p=p)
comp_radius, comp_Ts_idx, comp_subseq_idx = aamp_ostinato(Ts, m, p=p)
cmp_radius, cmp_Ts_idx, cmp_subseq_idx = aamp_ostinato(Ts, m, p=p)

npt.assert_almost_equal(ref_radius, comp_radius)
npt.assert_almost_equal(ref_Ts_idx, comp_Ts_idx)
npt.assert_almost_equal(ref_subseq_idx, comp_subseq_idx)
npt.assert_allclose(cmp_radius, ref_radius, atol=1.5e-07)
npt.assert_allclose(cmp_Ts_idx, ref_Ts_idx, atol=1.5e-07)
npt.assert_allclose(cmp_subseq_idx, ref_subseq_idx, atol=1.5e-07)


@pytest.mark.parametrize("runs", range(25))
Expand All @@ -61,11 +61,11 @@ def test_random_ostinatoed(runs, dask_cluster):
Ts = [rng.RNG.rand(n) for n in [64, 128, 256]]

ref_radius, ref_Ts_idx, ref_subseq_idx = naive.aamp_ostinato(Ts, m)
comp_radius, comp_Ts_idx, comp_subseq_idx = aamp_ostinatoed(dask_client, Ts, m)
cmp_radius, cmp_Ts_idx, cmp_subseq_idx = aamp_ostinatoed(dask_client, Ts, m)

npt.assert_almost_equal(ref_radius, comp_radius)
npt.assert_almost_equal(ref_Ts_idx, comp_Ts_idx)
npt.assert_almost_equal(ref_subseq_idx, comp_subseq_idx)
npt.assert_allclose(cmp_radius, ref_radius, atol=1.5e-07)
npt.assert_allclose(cmp_Ts_idx, ref_Ts_idx, atol=1.5e-07)
npt.assert_allclose(cmp_subseq_idx, ref_subseq_idx, atol=1.5e-07)


@pytest.mark.parametrize("seed", [41, 88, 290, 292, 310, 328, 538, 556, 563, 570])
Expand All @@ -78,13 +78,13 @@ def test_deterministic_ostinatoed(seed, dask_cluster):

for p in [1.0, 2.0, 3.0]:
ref_radius, ref_Ts_idx, ref_subseq_idx = naive.aamp_ostinato(Ts, m, p=p)
comp_radius, comp_Ts_idx, comp_subseq_idx = aamp_ostinatoed(
cmp_radius, cmp_Ts_idx, cmp_subseq_idx = aamp_ostinatoed(
dask_client, Ts, m, p=p
)

npt.assert_almost_equal(ref_radius, comp_radius)
npt.assert_almost_equal(ref_Ts_idx, comp_Ts_idx)
npt.assert_almost_equal(ref_subseq_idx, comp_subseq_idx)
npt.assert_allclose(cmp_radius, ref_radius, atol=1.5e-07)
npt.assert_allclose(cmp_Ts_idx, ref_Ts_idx, atol=1.5e-07)
npt.assert_allclose(cmp_subseq_idx, ref_subseq_idx, atol=1.5e-07)


def test_input_not_overwritten_ostinato():
Expand All @@ -101,42 +101,46 @@ def test_input_not_overwritten_ostinato():
aamp_ostinato(Ts_input, m)
for i in range(len(Ts)):
T_ref = Ts[i]
T_comp = Ts_input[i]
npt.assert_almost_equal(T_ref[np.isfinite(T_ref)], T_comp[np.isfinite(T_comp)])
T_cmp = Ts_input[i]
npt.assert_allclose(
T_cmp[np.isfinite(T_cmp)], T_ref[np.isfinite(T_ref)], atol=1.5e-07
)


def test_extract_several_consensus_ostinato():
# This test is to further ensure that the function `aamp_ostinato`
# does not tamper with the original data.
Ts = [rng.RNG.rand(n) for n in [256, 512, 1024]]
Ts_ref = [T.copy() for T in Ts]
Ts_comp = [T.copy() for T in Ts]
Ts_cmp = [T.copy() for T in Ts]

m = 20

k = 5 # Get the first `k` consensus motifs
for _ in range(k):
# Find consensus motif and its NN in each time series in Ts_comp
# Remove them from Ts_comp as well as Ts_ref, and assert that the
# Find consensus motif and its NN in each time series in Ts_cmp
# Remove them from Ts_cmp as well as Ts_ref, and assert that the
# two time series are the same
radius, Ts_idx, subseq_idx = aamp_ostinato(Ts_comp, m)
consensus_motif = Ts_comp[Ts_idx][subseq_idx : subseq_idx + m].copy()
for i in range(len(Ts_comp)):
radius, Ts_idx, subseq_idx = aamp_ostinato(Ts_cmp, m)
consensus_motif = Ts_cmp[Ts_idx][subseq_idx : subseq_idx + m].copy()
for i in range(len(Ts_cmp)):
if i == Ts_idx:
query_idx = subseq_idx
else:
query_idx = None

idx = np.argmin(
core.mass(
consensus_motif, Ts_comp[i], normalize=False, query_idx=query_idx
consensus_motif, Ts_cmp[i], normalize=False, query_idx=query_idx
)
)
Ts_comp[i][idx : idx + m] = np.nan
Ts_cmp[i][idx : idx + m] = np.nan
Ts_ref[i][idx : idx + m] = np.nan

npt.assert_almost_equal(
Ts_ref[i][np.isfinite(Ts_ref[i])], Ts_comp[i][np.isfinite(Ts_comp[i])]
npt.assert_allclose(
Ts_cmp[i][np.isfinite(Ts_cmp[i])],
Ts_ref[i][np.isfinite(Ts_ref[i])],
atol=1.5e-07,
)


Expand All @@ -155,9 +159,9 @@ def test_input_not_overwritten_ostinatoed(dask_cluster):
aamp_ostinatoed(dask_client, Ts_input, m)
for i in range(len(Ts)):
T_ref = Ts[i]
T_comp = Ts_input[i]
npt.assert_almost_equal(
T_ref[np.isfinite(T_ref)], T_comp[np.isfinite(T_comp)]
T_cmp = Ts_input[i]
npt.assert_allclose(
T_cmp[np.isfinite(T_cmp)], T_ref[np.isfinite(T_ref)], atol=1.5e-07
)


Expand All @@ -166,19 +170,19 @@ def test_extract_several_consensus_ostinatoed(dask_cluster):
# does not tamper with the original data.
Ts = [rng.RNG.rand(n) for n in [256, 512, 1024]]
Ts_ref = [T.copy() for T in Ts]
Ts_comp = [T.copy() for T in Ts]
Ts_cmp = [T.copy() for T in Ts]

m = 20

with Client(dask_cluster) as dask_client:
k = 5 # Get the first `k` consensus motifs
for _ in range(k):
# Find consensus motif and its NN in each time series in Ts_comp
# Remove them from Ts_comp as well as Ts_ref, and assert that the
# Find consensus motif and its NN in each time series in Ts_cmp
# Remove them from Ts_cmp as well as Ts_ref, and assert that the
# two time series are the same
radius, Ts_idx, subseq_idx = aamp_ostinatoed(dask_client, Ts_comp, m)
consensus_motif = Ts_comp[Ts_idx][subseq_idx : subseq_idx + m].copy()
for i in range(len(Ts_comp)):
radius, Ts_idx, subseq_idx = aamp_ostinatoed(dask_client, Ts_cmp, m)
consensus_motif = Ts_cmp[Ts_idx][subseq_idx : subseq_idx + m].copy()
for i in range(len(Ts_cmp)):
if i == Ts_idx:
query_idx = subseq_idx
else:
Expand All @@ -187,15 +191,16 @@ def test_extract_several_consensus_ostinatoed(dask_cluster):
idx = np.argmin(
core.mass(
consensus_motif,
Ts_comp[i],
Ts_cmp[i],
normalize=False,
query_idx=query_idx,
)
)
Ts_comp[i][idx : idx + m] = np.nan
Ts_cmp[i][idx : idx + m] = np.nan
Ts_ref[i][idx : idx + m] = np.nan

npt.assert_almost_equal(
npt.assert_allclose(
Ts_cmp[i][np.isfinite(Ts_cmp[i])],
Ts_ref[i][np.isfinite(Ts_ref[i])],
Ts_comp[i][np.isfinite(Ts_comp[i])],
atol=1.5e-07,
)
Loading