Skip to content
Merged
Changes from all commits
Commits
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
25 changes: 13 additions & 12 deletions tests/test_utils/test_measures.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,21 @@


@pytest.mark.parametrize(
"values, weights, percentile, expected_result",
"values, weights, percentiles, expected_result",
[
([[0.5, 0.5], [0.6, 0.4]], None, 50.0, [[0.55, 0.45]]),
([[0.5, 0.5], [0.6, 0.4]], None, 40.0, [[0.5, 0.4]]),
([[0.3, 0.7], [0.6, 0.4], [0.1, 0.9]], None, 50.0, [[0.3, 0.7]]),
([[0.5, 0.5], [0.6, 0.4], [0.1, 0.9]], [0.1, 0.1, 1.0], 50.0, [[0.1, 0.9]]),
([[0.5, 0.5], [0.6, 0.4]], None, [50.0], [[0.55, 0.45]]),
([[0.5, 0.5], [0.6, 0.4]], None, [40.0], [[0.5, 0.4]]),
([[0.5, 0.5], [0.6, 0.4]], None, [50.0, 40.0], [[0.55, 0.45], [0.5, 0.4]]),
([[0.3, 0.7], [0.6, 0.4], [0.1, 0.9]], None, [50.0], [[0.3, 0.7]]),
([[0.5, 0.5], [0.6, 0.4], [0.1, 0.9]], [0.1, 0.1, 1.0], [50.0], [[0.1, 0.9]]),
(
[
[0.33, 0.33, 0.34],
[0.0, 0.5, 0.5],
[0.4, 0.2, 0.4],
],
None,
50.0,
[50.0],
[[0.33, 0.33, 0.4]], # Does not sum to 1, and that's okay
),
(
Expand All @@ -28,7 +29,7 @@
[0.0, 0.0, 1.0],
],
None,
50.0,
[50.0],
[[0.0, 0.0, 0.0]],
),
(
Expand All @@ -39,7 +40,7 @@
[0.2, 0.6, 0.2],
],
None,
50.0,
[50.0],
[[0.265, 0.415, 0.37]],
),
(
Expand All @@ -50,19 +51,19 @@
[0.2, 0.6, 0.2],
],
[0.1, 0.2, 0.3, 0.4],
50.0,
[50.0],
[[0.2, 0.5, 0.37]],
),
],
)
def test_weighted_percentile_2d(values, weights, percentile, expected_result):
def test_weighted_percentile_2d(values, weights, percentiles, expected_result):
values = np.array(values)
weights = np.array(weights) if weights is not None else None

result = weighted_percentile_2d(
values=values, weights=weights, percentiles=[percentile]
values=values, weights=weights, percentiles=percentiles
)
np.testing.assert_allclose(result, expected_result)
if weights is None and percentile == 50.0: # should behave like np.median
if weights is None and [percentiles] == [50.0]: # should behave like np.median
numpy_medians = np.median(values, axis=0)
np.testing.assert_allclose(result, [numpy_medians])