added nested sampler uncertainty to pybind and outputs

Author: alexhroom

RATapi/outputs.py

@@ -149,6 +149,7 @@ class DreamOutput(RATResult):
 @dataclass
 class NestedSamplerOutput(RATResult):
     logZ: float
+    logZErr: float
     nestSamples: np.ndarray
     postSamples: np.ndarray
 
@@ -230,6 +231,7 @@ def make_results(
 
         nested_sampler_output = NestedSamplerOutput(
             logZ=bayes_results.nestedSamplerOutput.logZ,
+            logZErr=bayes_results.nestedSamplerOutput.logZErr,
             nestSamples=bayes_results.nestedSamplerOutput.nestSamples,
             postSamples=bayes_results.nestedSamplerOutput.postSamples,
         )

cpp/rat.cpp

@@ -315,6 +315,7 @@ struct ConfidenceIntervals
 struct NestedSamplerOutput
 {
     real_T logZ;
+    real_T logZErr;
     py::array_t<real_T> nestSamples;
     py::array_t<real_T> postSamples;
 };
@@ -1243,6 +1244,7 @@ BayesResults bayesResultsFromStruct9T(const RAT::struct9_T results)
     bayesResults.confidenceIntervals.mean = pyArrayFromRatArray2d(results.confidenceIntervals.mean);
 
     bayesResults.nestedSamplerOutput.logZ = results.nestedSamplerOutput.LogZ;
+    bayesResults.nestedSamplerOutput.logZErr = results.nestedSamplerOutput.LogZErr;
     bayesResults.nestedSamplerOutput.nestSamples = pyArrayFromRatArray2d(results.nestedSamplerOutput.nestSamples);
     bayesResults.nestedSamplerOutput.postSamples = pyArrayFromRatArray2d(results.nestedSamplerOutput.postSamples);
 
@@ -1445,6 +1447,7 @@ PYBIND11_MODULE(rat_core, m) {
     py::class_<NestedSamplerOutput>(m, "NestedSamplerOutput")
         .def(py::init<>())
         .def_readwrite("logZ", &NestedSamplerOutput::logZ)
+        .def_readwrite("logZErr", &NestedSamplerOutput::logZErr)
         .def_readwrite("nestSamples", &NestedSamplerOutput::nestSamples)
         .def_readwrite("postSamples", &NestedSamplerOutput::postSamples);
 

tests/conftest.py

@@ -5639,6 +5639,7 @@ def dream_results():
         ),
         nestedSamplerOutput=RATapi.outputs.NestedSamplerOutput(
             logZ=0.0,
+            logZErr=0.0,
             nestSamples=np.array([[0.0, 0.0]]),
             postSamples=np.array([[0.0, 0.0]]),
         ),

tests/test_outputs.py

@@ -126,6 +126,7 @@ def dream_str():
         "),\n"
         "nestedSamplerOutput = NestedSamplerOutput(\n"
         "\tlogZ = 0.0,\n"
+        "\tlogZErr = 0.0,\n"
         "\tnestSamples = Data array: [1 x 2],\n"
         "\tpostSamples = Data array: [1 x 2],\n"
         "),\n"