Skip to content

Commit 669f1d7

Browse files
committed
Add type-hints to adaptive/tests/test_average_learner1d.py
1 parent 629cd35 commit 669f1d7

File tree

1 file changed

+4
-18
lines changed

1 file changed

+4
-18
lines changed

adaptive/tests/test_average_learner1d.py

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
from itertools import chain
2-
31
import numpy as np
2+
import pandas as pd
3+
from pandas.testing import assert_series_equal
44

55
from adaptive import AverageLearner1D
66
from adaptive.tests.test_learners import (
@@ -11,27 +11,13 @@
1111

1212

1313
def almost_equal_dicts(a, b):
14-
assert a.keys() == b.keys()
15-
for k, v1 in a.items():
16-
v2 = b[k]
17-
if (
18-
v1 is None
19-
or v2 is None
20-
or isinstance(v1, (tuple, list))
21-
and any(x is None for x in chain(v1, v2))
22-
):
23-
assert v1 == v2
24-
else:
25-
try:
26-
np.testing.assert_almost_equal(v1, v2)
27-
except TypeError:
28-
raise AssertionError(f"{v1} != {v2}")
14+
assert_series_equal(pd.Series(sorted(a.items())), pd.Series(sorted(b.items())))
2915

3016

3117
def test_tell_many_at_point():
3218
f = generate_random_parametrization(noisy_peak)
3319
learner = AverageLearner1D(f, bounds=(-2, 2))
34-
control = learner.new()
20+
control = AverageLearner1D(f, bounds=(-2, 2))
3521
learner._recompute_losses_factor = 1
3622
control._recompute_losses_factor = 1
3723
simple_run(learner, 100)

0 commit comments

Comments
 (0)