Skip to content

Commit cfc6510

Browse files
authored
Adds uncertainty to nested sampler output (#115)
* added nested sampler uncertainty to pybind and outputs * updated submodule
1 parent b1a0e44 commit cfc6510

File tree

5 files changed

+8
-1
lines changed

5 files changed

+8
-1
lines changed

RATapi/outputs.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,7 @@ class DreamOutput(RATResult):
149149
@dataclass
150150
class NestedSamplerOutput(RATResult):
151151
logZ: float
152+
logZErr: float
152153
nestSamples: np.ndarray
153154
postSamples: np.ndarray
154155

@@ -230,6 +231,7 @@ def make_results(
230231

231232
nested_sampler_output = NestedSamplerOutput(
232233
logZ=bayes_results.nestedSamplerOutput.logZ,
234+
logZErr=bayes_results.nestedSamplerOutput.logZErr,
233235
nestSamples=bayes_results.nestedSamplerOutput.nestSamples,
234236
postSamples=bayes_results.nestedSamplerOutput.postSamples,
235237
)

cpp/rat.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -315,6 +315,7 @@ struct ConfidenceIntervals
315315
struct NestedSamplerOutput
316316
{
317317
real_T logZ;
318+
real_T logZErr;
318319
py::array_t<real_T> nestSamples;
319320
py::array_t<real_T> postSamples;
320321
};
@@ -1255,6 +1256,7 @@ BayesResults bayesResultsFromStruct9T(const RAT::struct9_T results)
12551256
bayesResults.confidenceIntervals.mean = pyArrayFromRatArray2d(results.confidenceIntervals.mean);
12561257

12571258
bayesResults.nestedSamplerOutput.logZ = results.nestedSamplerOutput.LogZ;
1259+
bayesResults.nestedSamplerOutput.logZErr = results.nestedSamplerOutput.LogZErr;
12581260
bayesResults.nestedSamplerOutput.nestSamples = pyArrayFromRatArray2d(results.nestedSamplerOutput.nestSamples);
12591261
bayesResults.nestedSamplerOutput.postSamples = pyArrayFromRatArray2d(results.nestedSamplerOutput.postSamples);
12601262

@@ -1457,6 +1459,7 @@ PYBIND11_MODULE(rat_core, m) {
14571459
py::class_<NestedSamplerOutput>(m, "NestedSamplerOutput")
14581460
.def(py::init<>())
14591461
.def_readwrite("logZ", &NestedSamplerOutput::logZ)
1462+
.def_readwrite("logZErr", &NestedSamplerOutput::logZErr)
14601463
.def_readwrite("nestSamples", &NestedSamplerOutput::nestSamples)
14611464
.def_readwrite("postSamples", &NestedSamplerOutput::postSamples);
14621465

tests/conftest.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5619,6 +5619,7 @@ def dream_results():
56195619
),
56205620
nestedSamplerOutput=RATapi.outputs.NestedSamplerOutput(
56215621
logZ=0.0,
5622+
logZErr=0.0,
56225623
nestSamples=np.array([[0.0, 0.0]]),
56235624
postSamples=np.array([[0.0, 0.0]]),
56245625
),

tests/test_outputs.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ def dream_str():
126126
"),\n"
127127
"nestedSamplerOutput = NestedSamplerOutput(\n"
128128
"\tlogZ = 0.0,\n"
129+
"\tlogZErr = 0.0,\n"
129130
"\tnestSamples = Data array: [1 x 2],\n"
130131
"\tpostSamples = Data array: [1 x 2],\n"
131132
"),\n"

0 commit comments

Comments
 (0)