From f45e005bfb286074fde0d3682bfc22879706a0f4 Mon Sep 17 00:00:00 2001 From: Will Handley Date: Tue, 1 Aug 2023 21:21:39 +0100 Subject: [PATCH 01/21] Fix for logL_birth --- anesthetic/samples.py | 30 ++++++++++++++++++++++++------ tests/test_samples.py | 4 ++++ 2 files changed, 28 insertions(+), 6 deletions(-) diff --git a/anesthetic/samples.py b/anesthetic/samples.py index c454f682..a7d83ec7 100644 --- a/anesthetic/samples.py +++ b/anesthetic/samples.py @@ -244,8 +244,12 @@ def plot_1d(self, axes=None, *args, **kwargs): for x, ax in axes.items(): if x in self and kwargs['kind'] is not None: xlabel = self.get_label(x) - self[x].plot(ax=ax, xlabel=xlabel, - *args, **kwargs) + if x == 'logL_birth': + self[x].replace(-np.inf, np.nan + ).dropna().plot(ax=ax, xlabel=xlabel, + *args, **kwargs) + else: + self[x].plot(ax=ax, xlabel=xlabel, *args, **kwargs) ax.set_xlabel(xlabel) else: ax.plot([], []) @@ -389,13 +393,27 @@ def plot_2d(self, axes=None, *args, **kwargs): xlabel = self.get_label(x) ylabel = self.get_label(y) if x == y: - self[x].plot(ax=ax.twin, xlabel=xlabel, - *args, **lkwargs) + if x == 'logL_birth': + self[x].replace(-np.inf, np.nan + ).dropna().plot(ax=ax.twin, + xlabel=xlabel, + *args, + **lkwargs) + else: + self[x].plot(ax=ax.twin, xlabel=xlabel, *args, + **lkwargs) ax.set_xlabel(xlabel) ax.set_ylabel(ylabel) else: - self.plot(x, y, ax=ax, xlabel=xlabel, - ylabel=ylabel, *args, **lkwargs) + if x == 'logL_birth' or y == 'logL_birth': + self.replace(-np.inf, np.nan + ).dropna().plot(x, y, ax=ax, + xlabel=xlabel, + ylabel=ylabel, + *args, **lkwargs) + else: + self.plot(x, y, ax=ax, xlabel=xlabel, + ylabel=ylabel, *args, **lkwargs) ax.set_xlabel(xlabel) ax.set_ylabel(ylabel) else: diff --git a/tests/test_samples.py b/tests/test_samples.py index 329a0a81..87a3e81d 100644 --- a/tests/test_samples.py +++ b/tests/test_samples.py @@ -440,6 +440,10 @@ def test_plot_1d_no_axes(): assert axes.iloc[0].get_xlabel() == 'x0' assert axes.iloc[1].get_xlabel() == 'x1' assert axes.iloc[2].get_xlabel() == 'x2' + axes = ns.plot_1d() + assert axes['logL_birth'].get_xlim()[0] > -1000 + axes = ns[['x0', 'logL_birth']].plot_2d() + assert axes['logL_birth']['logL_birth'].get_xlim()[0] > -1000 def test_mcmc_stats(): From bdc97db1f36c72c6b57a94e5582d5e453bb79cd4 Mon Sep 17 00:00:00 2001 From: Will Handley Date: Tue, 1 Aug 2023 22:28:14 +0100 Subject: [PATCH 02/21] bump version to 2.1.5 --- README.rst | 2 +- anesthetic/_version.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index b3b82ad9..149aae26 100644 --- a/README.rst +++ b/README.rst @@ -2,7 +2,7 @@ anesthetic: nested sampling post-processing =========================================== :Authors: Will Handley and Lukas Hergt -:Version: 2.1.4 +:Version: 2.1.5 :Homepage: https://github.com/handley-lab/anesthetic :Documentation: http://anesthetic.readthedocs.io/ diff --git a/anesthetic/_version.py b/anesthetic/_version.py index 503eeb92..cfb007cb 100644 --- a/anesthetic/_version.py +++ b/anesthetic/_version.py @@ -1 +1 @@ -__version__ = '2.1.4' +__version__ = '2.1.5' From 85618c3f3da2008c9b6756ebdfdfacec60e99a3f Mon Sep 17 00:00:00 2001 From: Will Handley Date: Fri, 4 Aug 2023 12:55:34 +0100 Subject: [PATCH 03/21] bump version to 2.1.6 --- README.rst | 8 ++++---- anesthetic/_version.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.rst b/README.rst index 149aae26..cbbeb355 100644 --- a/README.rst +++ b/README.rst @@ -2,7 +2,7 @@ anesthetic: nested sampling post-processing =========================================== :Authors: Will Handley and Lukas Hergt -:Version: 2.1.5 +:Version: 2.1.6 :Homepage: https://github.com/handley-lab/anesthetic :Documentation: http://anesthetic.readthedocs.io/ @@ -136,15 +136,15 @@ If you use ``anesthetic`` to generate plots for a publication, please cite as: :: Handley, (2019). anesthetic: nested sampling visualisation. Journal of Open - Source Software, 4(37), 1414, https://doi.org/10.21105/joss.01414 + Source Software, 4(37), 1414, https://doi.org/10.2.1.6/joss.01414 or using the BibTeX: .. code:: bibtex @article{anesthetic, - doi = {10.21105/joss.01414}, - url = {http://dx.doi.org/10.21105/joss.01414}, + doi = {10.2.1.6/joss.01414}, + url = {http://dx.doi.org/10.2.1.6/joss.01414}, year = {2019}, month = {Jun}, publisher = {The Open Journal}, diff --git a/anesthetic/_version.py b/anesthetic/_version.py index cfb007cb..da04cc33 100644 --- a/anesthetic/_version.py +++ b/anesthetic/_version.py @@ -1 +1 @@ -__version__ = '2.1.5' +__version__ = '2.1.6' From 343caff0d7f20bab74ddc0391b2a570556f703fe Mon Sep 17 00:00:00 2001 From: Will Handley Date: Fri, 4 Aug 2023 15:38:59 +0100 Subject: [PATCH 04/21] now avoiding dropna where possible and reducing code repetition --- anesthetic/samples.py | 38 +++++++++++++++++--------------------- tests/test_samples.py | 9 ++++++--- 2 files changed, 23 insertions(+), 24 deletions(-) diff --git a/anesthetic/samples.py b/anesthetic/samples.py index a7d83ec7..8e69eaaa 100644 --- a/anesthetic/samples.py +++ b/anesthetic/samples.py @@ -244,12 +244,10 @@ def plot_1d(self, axes=None, *args, **kwargs): for x, ax in axes.items(): if x in self and kwargs['kind'] is not None: xlabel = self.get_label(x) + selfx = self[x] if x == 'logL_birth': - self[x].replace(-np.inf, np.nan - ).dropna().plot(ax=ax, xlabel=xlabel, - *args, **kwargs) - else: - self[x].plot(ax=ax, xlabel=xlabel, *args, **kwargs) + selfx.replace(-np.inf, np.nan, inplace=True) + selfx.plot(ax=ax, xlabel=xlabel, *args, **kwargs) ax.set_xlabel(xlabel) else: ax.plot([], []) @@ -393,27 +391,25 @@ def plot_2d(self, axes=None, *args, **kwargs): xlabel = self.get_label(x) ylabel = self.get_label(y) if x == y: + selfx = self[x] if x == 'logL_birth': - self[x].replace(-np.inf, np.nan - ).dropna().plot(ax=ax.twin, - xlabel=xlabel, - *args, - **lkwargs) - else: - self[x].plot(ax=ax.twin, xlabel=xlabel, *args, - **lkwargs) + selfx.replace(-np.inf, np.nan, inplace=True) + selfx.plot(ax=ax.twin, xlabel=xlabel, + *args, **lkwargs) ax.set_xlabel(xlabel) ax.set_ylabel(ylabel) else: + selfxy = self if x == 'logL_birth' or y == 'logL_birth': - self.replace(-np.inf, np.nan - ).dropna().plot(x, y, ax=ax, - xlabel=xlabel, - ylabel=ylabel, - *args, **lkwargs) - else: - self.plot(x, y, ax=ax, xlabel=xlabel, - ylabel=ylabel, *args, **lkwargs) + if self.islabelled(): + label = ('logL_birth', + self.get_label('logL_birth')) + else: + label = 'logL_birth' + selfxy = self.replace({label: -np.inf}, np.nan) + selfxy = selfxy.dropna(axis=0, subset=[label]) + selfxy.plot(x, y, ax=ax, xlabel=xlabel, + ylabel=ylabel, *args, **lkwargs) ax.set_xlabel(xlabel) ax.set_ylabel(ylabel) else: diff --git a/tests/test_samples.py b/tests/test_samples.py index 87a3e81d..9bb932e2 100644 --- a/tests/test_samples.py +++ b/tests/test_samples.py @@ -428,6 +428,9 @@ def test_plot_2d_no_axes(): assert axes.iloc[-1, 1].get_xlabel() == 'x1' assert axes.iloc[-1, 2].get_xlabel() == 'x2' + axes = ns[['x0', 'logL_birth']].plot_2d() + axes = ns.drop_labels()[['x0', 'logL_birth']].plot_2d() + def test_plot_1d_no_axes(): np.random.seed(3) @@ -440,10 +443,10 @@ def test_plot_1d_no_axes(): assert axes.iloc[0].get_xlabel() == 'x0' assert axes.iloc[1].get_xlabel() == 'x1' assert axes.iloc[2].get_xlabel() == 'x2' + axes = ns.plot_1d() - assert axes['logL_birth'].get_xlim()[0] > -1000 - axes = ns[['x0', 'logL_birth']].plot_2d() - assert axes['logL_birth']['logL_birth'].get_xlim()[0] > -1000 + axes = ns[['x0', 'logL_birth']].plot_1d() + axes = ns.drop_labels()[['x0', 'logL_birth']].plot_1d() def test_mcmc_stats(): From b185eb19e8063fb06a3875d1f7906e1e2f96f942 Mon Sep 17 00:00:00 2001 From: lukashergt Date: Wed, 16 Aug 2023 12:43:39 -0700 Subject: [PATCH 05/21] version bump to 2.2.2 --- README.rst | 2 +- anesthetic/_version.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index b82604ed..d8ed0e39 100644 --- a/README.rst +++ b/README.rst @@ -2,7 +2,7 @@ anesthetic: nested sampling post-processing =========================================== :Authors: Will Handley and Lukas Hergt -:Version: 2.2.1 +:Version: 2.2.2 :Homepage: https://github.com/handley-lab/anesthetic :Documentation: http://anesthetic.readthedocs.io/ diff --git a/anesthetic/_version.py b/anesthetic/_version.py index 36a511ec..f1edb192 100644 --- a/anesthetic/_version.py +++ b/anesthetic/_version.py @@ -1 +1 @@ -__version__ = '2.2.1' +__version__ = '2.2.2' From 318d1e0af35c70771b7ebc92553614d7bd811065 Mon Sep 17 00:00:00 2001 From: Will Handley Date: Sun, 20 Aug 2023 23:28:28 +0100 Subject: [PATCH 06/21] Dropping all infs with warnings --- anesthetic/samples.py | 26 +++++++++++--------------- tests/test_samples.py | 16 ---------------- 2 files changed, 11 insertions(+), 31 deletions(-) diff --git a/anesthetic/samples.py b/anesthetic/samples.py index 8e69eaaa..bcd60b9c 100644 --- a/anesthetic/samples.py +++ b/anesthetic/samples.py @@ -244,9 +244,9 @@ def plot_1d(self, axes=None, *args, **kwargs): for x, ax in axes.items(): if x in self and kwargs['kind'] is not None: xlabel = self.get_label(x) - selfx = self[x] - if x == 'logL_birth': - selfx.replace(-np.inf, np.nan, inplace=True) + if ~np.isfinite(self[x]).all(): + warnings.warn(f"column {x} has inf values.") + selfx = self[x].replace([-np.inf, np.inf], np.nan) selfx.plot(ax=ax, xlabel=xlabel, *args, **kwargs) ax.set_xlabel(xlabel) else: @@ -390,24 +390,20 @@ def plot_2d(self, axes=None, *args, **kwargs): if x in self and y in self and lkwargs['kind'] is not None: xlabel = self.get_label(x) ylabel = self.get_label(y) + if ~np.isfinite(self[x]).all(): + warnings.warn(f"column {x} has inf values.") if x == y: - selfx = self[x] - if x == 'logL_birth': - selfx.replace(-np.inf, np.nan, inplace=True) + selfx = self[x].replace([-np.inf, np.inf], np.nan) selfx.plot(ax=ax.twin, xlabel=xlabel, *args, **lkwargs) ax.set_xlabel(xlabel) ax.set_ylabel(ylabel) else: - selfxy = self - if x == 'logL_birth' or y == 'logL_birth': - if self.islabelled(): - label = ('logL_birth', - self.get_label('logL_birth')) - else: - label = 'logL_birth' - selfxy = self.replace({label: -np.inf}, np.nan) - selfxy = selfxy.dropna(axis=0, subset=[label]) + if ~np.isfinite(self[y]).all(): + warnings.warn(f"column {y} has inf values.") + selfxy = self[[x, y]] + selfxy = self.replace([-np.inf, np.inf], np.nan) + selfxy = selfxy.dropna(axis=0) selfxy.plot(x, y, ax=ax, xlabel=xlabel, ylabel=ylabel, *args, **lkwargs) ax.set_xlabel(xlabel) diff --git a/tests/test_samples.py b/tests/test_samples.py index 655e31c9..c875324c 100644 --- a/tests/test_samples.py +++ b/tests/test_samples.py @@ -983,22 +983,6 @@ def test_live_points(): assert not live_points.isweighted() -def test_contour_plot_2d_nan(): - """Contour plots with nans arising from issue #96""" - np.random.seed(3) - ns = read_chains('./tests/example_data/pc') - - ns.loc[:9, ('x0', '$x_0$')] = np.nan - with pytest.raises((np.linalg.LinAlgError, RuntimeError, ValueError)): - ns.plot_2d(['x0', 'x1']) - - # Check this error is removed in the case of zero weights - weights = ns.get_weights() - weights[:10] = 0 - ns.set_weights(weights, inplace=True) - ns.plot_2d(['x0', 'x1']) - - def test_compute_insertion(): np.random.seed(3) ns = read_chains('./tests/example_data/pc') From df622ef3cc7e27638c7801ca5e4ca14899f39989 Mon Sep 17 00:00:00 2001 From: Will Handley Date: Tue, 22 Aug 2023 08:39:43 +0100 Subject: [PATCH 07/21] Corrected bump_version script --- bin/bump_version.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bin/bump_version.py b/bin/bump_version.py index d5a0671d..1be215ac 100755 --- a/bin/bump_version.py +++ b/bin/bump_version.py @@ -8,6 +8,7 @@ current_version = run("cat", vfile) current_version = current_version.split("=")[-1].strip().strip("'") +escaped_version = current_version.replace(".", "\.") current_version = version.parse(current_version) if len(sys.argv) > 1: @@ -32,7 +33,7 @@ new_version = version.parse(f"{major}.{minor}.{micro}") for f in [vfile, README]: - run("sed", "-i", f"s/{current_version}/{new_version}/g", f) + run("sed", "-i", f"s/{escaped_version}/{new_version}/g", f) run("git", "add", vfile, README) run("git", "commit", "-m", f"bump version to {new_version}") From b51b3ef738115f1e84e23cd3da418757a08642e6 Mon Sep 17 00:00:00 2001 From: Will Handley Date: Tue, 22 Aug 2023 08:44:41 +0100 Subject: [PATCH 08/21] Added a scatter kind --- anesthetic/samples.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/anesthetic/samples.py b/anesthetic/samples.py index 8e69eaaa..918ce05d 100644 --- a/anesthetic/samples.py +++ b/anesthetic/samples.py @@ -311,6 +311,9 @@ def plot_2d(self, axes=None, *args, **kwargs): - 'hist_1d': 1d histograms down the diagonal - 'hist_2d': 2d histograms in lower triangle - 'hist': 1d & 2d histograms in lower & diagonal + - 'scatter_2d': 2d scatter in lower triangle + - 'scatter': 1d histograms down diagonal + & 2d scatter in lower triangle Feel free to add your own to this list! Default: @@ -431,6 +434,8 @@ def plot_2d(self, axes=None, *args, **kwargs): 'hist': {'diagonal': 'hist_1d', 'lower': 'hist_2d'}, 'hist_1d': {'diagonal': 'hist_1d'}, 'hist_2d': {'lower': 'hist_2d'}, + 'scatter': {'diagonal': 'hist_1d', 'lower': 'scatter_2d'}, + 'scatter_2d': {'lower': 'scatter_2d'}, } def importance_sample(self, logL_new, action='add', inplace=False): From 247c10c2b905b39e6f6c3749e332ad34a6c54ae2 Mon Sep 17 00:00:00 2001 From: lukashergt Date: Fri, 29 Sep 2023 17:54:43 -0700 Subject: [PATCH 09/21] fix mistakenly changed DOI in README --- README.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.rst b/README.rst index bb0bd737..844b6e7a 100644 --- a/README.rst +++ b/README.rst @@ -136,15 +136,15 @@ If you use ``anesthetic`` to generate plots for a publication, please cite as: :: Handley, (2019). anesthetic: nested sampling visualisation. Journal of Open - Source Software, 4(37), 1414, https://doi.org/10.2.1.6/joss.01414 + Source Software, 4(37), 1414, https://doi.org/10.21105/joss.01414 or using the BibTeX: .. code:: bibtex @article{anesthetic, - doi = {10.2.1.6/joss.01414}, - url = {http://dx.doi.org/10.2.1.6/joss.01414}, + doi = {10.21105/joss.01414}, + url = {http://dx.doi.org/10.21105/joss.01414}, year = {2019}, month = {Jun}, publisher = {The Open Journal}, From a498a0b1304b26b627b3ce2732200c7258b80a6c Mon Sep 17 00:00:00 2001 From: lukashergt Date: Fri, 29 Sep 2023 18:03:58 -0700 Subject: [PATCH 10/21] check for inf directly instead of indirectly using isfinite, since nans are actually ok here --- anesthetic/samples.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/anesthetic/samples.py b/anesthetic/samples.py index 1d5dfcf6..62622b47 100644 --- a/anesthetic/samples.py +++ b/anesthetic/samples.py @@ -237,7 +237,7 @@ def plot_1d(self, axes=None, *args, **kwargs): for x, ax in axes.items(): if x in self and kwargs['kind'] is not None: xlabel = self.get_label(x) - if ~np.isfinite(self[x]).all(): + if np.isinf(self[x]).any(): warnings.warn(f"column {x} has inf values.") selfx = self[x].replace([-np.inf, np.inf], np.nan) selfx.plot(ax=ax, xlabel=xlabel, *args, **kwargs) @@ -386,7 +386,7 @@ def plot_2d(self, axes=None, *args, **kwargs): if x in self and y in self and lkwargs['kind'] is not None: xlabel = self.get_label(x) ylabel = self.get_label(y) - if ~np.isfinite(self[x]).all(): + if np.isinf(self[x]).any(): warnings.warn(f"column {x} has inf values.") if x == y: selfx = self[x].replace([-np.inf, np.inf], np.nan) @@ -395,7 +395,7 @@ def plot_2d(self, axes=None, *args, **kwargs): ax.set_xlabel(xlabel) ax.set_ylabel(ylabel) else: - if ~np.isfinite(self[y]).all(): + if np.isinf(self[x]).any(): warnings.warn(f"column {y} has inf values.") selfxy = self[[x, y]] selfxy = self.replace([-np.inf, np.inf], np.nan) From d2915fb7b1c2f5e0d1c2d2917c019dcd4b983922 Mon Sep 17 00:00:00 2001 From: lukashergt Date: Fri, 29 Sep 2023 18:04:45 -0700 Subject: [PATCH 11/21] add `pytest.warns` to tests to explicitly check for the existance of the newly added warnings and to keep our pytest output clean --- tests/test_samples.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/tests/test_samples.py b/tests/test_samples.py index 55dba35f..15bb06ce 100644 --- a/tests/test_samples.py +++ b/tests/test_samples.py @@ -417,8 +417,9 @@ def test_plot_2d_no_axes(): assert axes.iloc[-1, 1].get_xlabel() == 'x1' assert axes.iloc[-1, 2].get_xlabel() == 'x2' - axes = ns[['x0', 'logL_birth']].plot_2d() - axes = ns.drop_labels()[['x0', 'logL_birth']].plot_2d() + with pytest.warns(UserWarning): + axes = ns[['x0', 'logL_birth']].plot_2d() + axes = ns.drop_labels()[['x0', 'logL_birth']].plot_2d() def test_plot_1d_no_axes(): @@ -433,9 +434,10 @@ def test_plot_1d_no_axes(): assert axes.iloc[1].get_xlabel() == 'x1' assert axes.iloc[2].get_xlabel() == 'x2' - axes = ns.plot_1d() - axes = ns[['x0', 'logL_birth']].plot_1d() - axes = ns.drop_labels()[['x0', 'logL_birth']].plot_1d() + with pytest.warns(UserWarning): + axes = ns.plot_1d() + axes = ns[['x0', 'logL_birth']].plot_1d() + axes = ns.drop_labels()[['x0', 'logL_birth']].plot_1d() def test_mcmc_stats(): From fda5207d4f6830e859e4e85ad682159ec292657b Mon Sep 17 00:00:00 2001 From: Lukas Hergt Date: Thu, 2 Nov 2023 12:18:28 -0700 Subject: [PATCH 12/21] Update samples.py for pep8 --- anesthetic/samples.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anesthetic/samples.py b/anesthetic/samples.py index 74a53ab6..271a7d8b 100644 --- a/anesthetic/samples.py +++ b/anesthetic/samples.py @@ -254,7 +254,7 @@ def plot_1d(self, axes=None, *args, **kwargs): if np.isinf(self[x]).any(): warnings.warn(f"column {x} has inf values.") selfx = self[x].replace([-np.inf, np.inf], np.nan) - selfx.plot(ax=ax, xlabel=xlabel, logx=x in logx, + selfx.plot(ax=ax, xlabel=xlabel, logx=x in logx, *args, **kwargs) ax.set_xlabel(xlabel) else: From cc7dfd99696aeaf9d90e54230442b8b218ed9594 Mon Sep 17 00:00:00 2001 From: lukashergt Date: Fri, 3 Nov 2023 12:42:25 -0700 Subject: [PATCH 13/21] version bump to 2.5.2 --- README.rst | 2 +- anesthetic/_version.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index 7808577b..38a718f5 100644 --- a/README.rst +++ b/README.rst @@ -2,7 +2,7 @@ anesthetic: nested sampling post-processing =========================================== :Authors: Will Handley and Lukas Hergt -:Version: 2.5.1 +:Version: 2.5.2 :Homepage: https://github.com/handley-lab/anesthetic :Documentation: http://anesthetic.readthedocs.io/ diff --git a/anesthetic/_version.py b/anesthetic/_version.py index b8c54948..3bfa1a62 100644 --- a/anesthetic/_version.py +++ b/anesthetic/_version.py @@ -1 +1 @@ -__version__ = '2.5.1' +__version__ = '2.5.2' From 6dee428860fac07060263e76f14fc150723c71e0 Mon Sep 17 00:00:00 2001 From: Will Handley Date: Sat, 2 Mar 2024 00:42:26 +0000 Subject: [PATCH 14/21] bump version to 2.7.4 --- README.rst | 2 +- anesthetic/_version.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index a21078ae..629db408 100644 --- a/README.rst +++ b/README.rst @@ -2,7 +2,7 @@ anesthetic: nested sampling post-processing =========================================== :Authors: Will Handley and Lukas Hergt -:Version: 2.7.3 +:Version: 2.7.4 :Homepage: https://github.com/handley-lab/anesthetic :Documentation: http://anesthetic.readthedocs.io/ diff --git a/anesthetic/_version.py b/anesthetic/_version.py index 66eabed2..6a4b6851 100644 --- a/anesthetic/_version.py +++ b/anesthetic/_version.py @@ -1 +1 @@ -__version__ = '2.7.3' +__version__ = '2.7.4' From 96a71bf6fd3d4feb7ca6ffe63463d2cd77ac46db Mon Sep 17 00:00:00 2001 From: Will Handley Date: Sat, 2 Mar 2024 08:54:03 +0000 Subject: [PATCH 15/21] Removed obselete test for #96 --- tests/test_samples.py | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/tests/test_samples.py b/tests/test_samples.py index 8b9840fb..4298366c 100644 --- a/tests/test_samples.py +++ b/tests/test_samples.py @@ -1203,22 +1203,6 @@ def test_hist_range_1d(): assert x2 >= +1 -def test_contour_plot_2d_nan(): - """Contour plots with nans arising from issue #96""" - np.random.seed(3) - ns = read_chains('./tests/example_data/pc') - - ns.loc[:9, ('x0', '$x_0$')] = np.nan - with pytest.raises((np.linalg.LinAlgError, RuntimeError, ValueError)): - ns.plot_2d(['x0', 'x1']) - - # Check this error is removed in the case of zero weights - weights = ns.get_weights() - weights[:10] = 0 - ns.set_weights(weights, inplace=True) - ns.plot_2d(['x0', 'x1']) - - def test_compute_insertion(): np.random.seed(3) ns = read_chains('./tests/example_data/pc') From d3b2928453a5dcbf22e937c07ccad13b9b3b27bc Mon Sep 17 00:00:00 2001 From: Lukas Hergt Date: Mon, 8 Apr 2024 12:53:40 -0700 Subject: [PATCH 16/21] Update README.rst version to 2.8.5 --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 9c4a297d..4a469289 100644 --- a/README.rst +++ b/README.rst @@ -2,7 +2,7 @@ anesthetic: nested sampling post-processing =========================================== :Authors: Will Handley and Lukas Hergt -:Version: 2.8.4 +:Version: 2.8.5 :Homepage: https://github.com/handley-lab/anesthetic :Documentation: http://anesthetic.readthedocs.io/ From e1526ea8b46a69d56e61f9bccbda4c17c16d9668 Mon Sep 17 00:00:00 2001 From: Lukas Hergt Date: Mon, 8 Apr 2024 12:54:05 -0700 Subject: [PATCH 17/21] Update _version.py to 2.8.5 --- anesthetic/_version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anesthetic/_version.py b/anesthetic/_version.py index 84301efe..832a2a53 100644 --- a/anesthetic/_version.py +++ b/anesthetic/_version.py @@ -1 +1 @@ -__version__ = '2.8.4' +__version__ = '2.8.5' From b2136e3110da096b381a0e023eec5dd5a301893f Mon Sep 17 00:00:00 2001 From: Will Handley Date: Tue, 9 Apr 2024 09:54:31 +0100 Subject: [PATCH 18/21] bump version to 2.8.6 --- README.rst | 2 +- anesthetic/_version.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index 4a469289..c5686fc4 100644 --- a/README.rst +++ b/README.rst @@ -2,7 +2,7 @@ anesthetic: nested sampling post-processing =========================================== :Authors: Will Handley and Lukas Hergt -:Version: 2.8.5 +:Version: 2.8.6 :Homepage: https://github.com/handley-lab/anesthetic :Documentation: http://anesthetic.readthedocs.io/ diff --git a/anesthetic/_version.py b/anesthetic/_version.py index 832a2a53..7039ccb2 100644 --- a/anesthetic/_version.py +++ b/anesthetic/_version.py @@ -1 +1 @@ -__version__ = '2.8.5' +__version__ = '2.8.6' From 35b64b2a58bebd14be25a185bca7a2dd5661b6ec Mon Sep 17 00:00:00 2001 From: lukashergt Date: Tue, 9 Apr 2024 08:08:41 -0700 Subject: [PATCH 19/21] bump version to 2.8.7 --- README.rst | 2 +- anesthetic/_version.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index c5686fc4..0f05ad0f 100644 --- a/README.rst +++ b/README.rst @@ -2,7 +2,7 @@ anesthetic: nested sampling post-processing =========================================== :Authors: Will Handley and Lukas Hergt -:Version: 2.8.6 +:Version: 2.8.7 :Homepage: https://github.com/handley-lab/anesthetic :Documentation: http://anesthetic.readthedocs.io/ diff --git a/anesthetic/_version.py b/anesthetic/_version.py index 7039ccb2..af815f23 100644 --- a/anesthetic/_version.py +++ b/anesthetic/_version.py @@ -1 +1 @@ -__version__ = '2.8.6' +__version__ = '2.8.7' From e40cbec0172994f1c249eab392abb5b1725c1ae9 Mon Sep 17 00:00:00 2001 From: Will Handley Date: Tue, 9 Apr 2024 17:25:34 +0100 Subject: [PATCH 20/21] bump version to 2.8.8 --- README.rst | 2 +- anesthetic/_version.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index 0f05ad0f..3b3235ee 100644 --- a/README.rst +++ b/README.rst @@ -2,7 +2,7 @@ anesthetic: nested sampling post-processing =========================================== :Authors: Will Handley and Lukas Hergt -:Version: 2.8.7 +:Version: 2.8.8 :Homepage: https://github.com/handley-lab/anesthetic :Documentation: http://anesthetic.readthedocs.io/ diff --git a/anesthetic/_version.py b/anesthetic/_version.py index af815f23..5d4adb16 100644 --- a/anesthetic/_version.py +++ b/anesthetic/_version.py @@ -1 +1 @@ -__version__ = '2.8.7' +__version__ = '2.8.8' From 2242d50fbc78bb130317dc949bffb8cee90889c4 Mon Sep 17 00:00:00 2001 From: lukashergt Date: Tue, 9 Apr 2024 11:12:16 -0700 Subject: [PATCH 21/21] bump version to 2.8.9 --- README.rst | 2 +- anesthetic/_version.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index 3b3235ee..7e8f4f2c 100644 --- a/README.rst +++ b/README.rst @@ -2,7 +2,7 @@ anesthetic: nested sampling post-processing =========================================== :Authors: Will Handley and Lukas Hergt -:Version: 2.8.8 +:Version: 2.8.9 :Homepage: https://github.com/handley-lab/anesthetic :Documentation: http://anesthetic.readthedocs.io/ diff --git a/anesthetic/_version.py b/anesthetic/_version.py index 5d4adb16..bf560199 100644 --- a/anesthetic/_version.py +++ b/anesthetic/_version.py @@ -1 +1 @@ -__version__ = '2.8.8' +__version__ = '2.8.9'