Skip to content

Adds uncertainty to nested sampler output #115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alexhroom merged 2 commits into from
Jan 14, 2025
Merged

Adds uncertainty to nested sampler output #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8bd4f75
added nested sampler uncertainty to pybind and outputs
alexhroom Jan 14, 2025
8348905
updated submodule
alexhroom Jan 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions RATapi/outputs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,7 @@ class DreamOutput(RATResult):
@dataclass
class NestedSamplerOutput(RATResult):
logZ: float
logZErr: float
nestSamples: np.ndarray
postSamples: np.ndarray

Expand Down Expand Up @@ -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,
)
Expand Down
2 changes: 1 addition & 1 deletion cpp/RAT
Open in desktop
Submodule RAT updated 30 files
+6 −2 RATMain.cpp
+9 −8 RATMain_internal_types.h
+1 −1 RATMain_rtwutil.cpp
+1 −1 RATMain_rtwutil.h
+2 −1 RATMain_types.h
+2 −2 adaptive.cpp
+3 −3 adaptive.h
+1 −1 allocateLayersForContrast.cpp
+2 −2 allocateLayersForContrast.h
+1 −1 allocateParamsToLayers.cpp
+2 −2 allocateParamsToLayers.h
+1 −1 customLayers.cpp
+10 −10 customLayers1.cpp
+3 −3 customXY.cpp
+11 −11 customXY1.cpp
+2 −2 eventHelper.hpp
+1 −1 extractProblemParams.cpp
+2 −2 extractProblemParams.h
+24 −22 makeEmptyBayesResultsStruct.cpp
+1 −1 processCustomFunction1.cpp
+2 −2 processCustomFunction1.h
+1 −1 processCustomFunction3.cpp
+2 −2 processCustomFunction3.h
+2 −2 resampleLayers.cpp
+1 −1 resampleLayersReIm.cpp
+3 −0 runNestedSampler.cpp
+6 −6 standardLayers.cpp
+15 −15 standardLayers1.cpp
+2 −2 structConstructorHelper.cpp
+4 −4 structConstructorHelper.h
3 changes: 3 additions & 0 deletions cpp/rat.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
};
Expand Down Expand Up @@ -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);

Expand Down Expand Up @@ -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);

Expand Down
1 change: 1 addition & 0 deletions tests/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]]),
),
Expand Down
1 change: 1 addition & 0 deletions tests/test_outputs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading