From bb8988ca8d008cd4fba814002eed6b9f0b552dae Mon Sep 17 00:00:00 2001 From: Ricardo Pinho Date: Wed, 18 Nov 2026 13:36:55 -0500 Subject: [PATCH] Restore variable selection with ArviZ 1.x Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01LKxc9GKLwnyeV2jaZBxH9N --- src/corner/arviz_corner.py | 21 ++------------- tests/test_arviz_selection.py | 51 +++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 19 deletions(-) create mode 100644 tests/test_arviz_selection.py diff --git a/src/corner/arviz_corner.py b/src/corner/arviz_corner.py index 9f972af..90ae79a 100644 --- a/src/corner/arviz_corner.py +++ b/src/corner/arviz_corner.py @@ -3,7 +3,6 @@ __all__ = ["arviz_corner"] import logging -import re from collections.abc import Mapping import numpy as np @@ -18,24 +17,8 @@ # arviz < 1.0 from arviz.utils import _var_names, get_coords except ImportError: - # arviz >= 1.0: these functions were removed - - def _var_names(var_names, dataset, filter_vars=None): - if var_names is None: - return None - if filter_vars == "like": - return [ - v - for v in dataset.data_vars - if any(vn in v for vn in var_names) - ] - elif filter_vars == "regex": - return [ - v - for v in dataset.data_vars - if any(re.search(vn, v) for vn in var_names) - ] - return list(var_names) + # arviz >= 1.0: variable selection moved to arviz_base + from arviz_base.utils import _var_names def get_coords(dataset, coords): if not coords: diff --git a/tests/test_arviz_selection.py b/tests/test_arviz_selection.py new file mode 100644 index 0000000..10ab2ce --- /dev/null +++ b/tests/test_arviz_selection.py @@ -0,0 +1,51 @@ +# -*- coding: utf-8 -*- + +import numpy as np +import pytest +from matplotlib import pyplot as pl + +import corner + + +@pytest.mark.parametrize( + "var_names, filter_vars, expected", + [ + (["~theta"], None, ["mu", "tau"]), + (["~the"], "like", ["mu", "tau"]), + (["~^the.*"], "regex", ["mu", "tau"]), + ("mu", None, ["mu"]), + ("tau", "like", ["tau"]), + ("^mu$", "regex", ["mu"]), + (["theta", "mu"], None, ["theta", "mu"]), + (["tau"], "like", ["tau"]), + (["^mu$"], "regex", ["mu"]), + ], +) +def test_arviz_variable_selection(var_names, filter_vars, expected): + az = pytest.importorskip("arviz") + rng = np.random.default_rng(42) + posterior = { + name: rng.normal(size=(2, 100)) for name in ["mu", "tau", "theta"] + } + try: + data = az.from_dict(posterior=posterior) + except TypeError: + data = az.from_dict({"posterior": posterior}) + fig = corner.corner( + data, + var_names=var_names, + filter_vars=filter_vars, + quantiles=[0.5], + plot_contours=False, + ) + try: + ndim = len(expected) + assert len(fig.axes) == ndim**2 + for i, name in enumerate(expected): + # The median line checks selection against the original draws. + ax = fig.axes[i * ndim + i] + np.testing.assert_allclose( + ax.lines[0].get_xdata(), np.median(posterior[name]) + ) + finally: + pl.close(fig)