From 8588b700907b6391673f7582a440edce074596e6 Mon Sep 17 00:00:00 2001
From: Colm Talbot <colm.talbot@ligo.org>
Date: Thu, 27 Sep 2018 12:46:45 +1000
Subject: [PATCH] store nested samples and fix likelihoods stored in nestle
---
tupak/core/sampler/nestle.py | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/tupak/core/sampler/nestle.py b/tupak/core/sampler/nestle.py
index 4d6cd8a1f..34486e682 100644
--- a/tupak/core/sampler/nestle.py
+++ b/tupak/core/sampler/nestle.py
@@ -1,4 +1,5 @@
import numpy as np
+from pandas import DataFrame
from .base_sampler import Sampler
@@ -69,7 +70,13 @@ class Nestle(Sampler):
self.result.sampler_output = out
self.result.samples = nestle.resample_equal(out.samples, out.weights)
- self.result.log_likelihood_evaluations = out.logl
+ self.result.nested_samples = DataFrame(
+ out.samples, columns=self.search_parameter_keys)
+ self.result.nested_samples['weights'] = out.weights
+ self.result.nested_samples['log_likelihood'] = out.logl
+ idxs = [np.unique(np.where(self.result.samples[ii] == out.samples)[0])
+ for ii in range(len(out.logl))]
+ self.result.log_likelihood_evaluations = out.logl[idxs]
self.result.log_evidence = out.logz
self.result.log_evidence_err = out.logzerr
return self.result
--
GitLab