Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions API/RAT.m
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@
% dreamOutput [1 x 1] struct Diagnostic output information from a DREAM run. The fields
% are ``allChains``, ``outlierChains``, ``runtime``,
% ``iteration``, ``modelOutput``, ``AR``, ``R_stat``, and ``CR``.
% nestedSamplerOutput [1 x 1] struct Output from a nested sampler run. The fields are ``LogZ``,
% ``LogZErr``, ``nestSamples``, and ``postSamples``.
% nestedSamplerOutput [1 x 1] struct Output from a nested sampler run. The fields are ``logZ``,
% ``logZErr``, ``nestSamples``, and ``postSamples``.
% chain [M x nParams] double MCMC chains where M is the length of each chain.
% =================== ==================== ===============

Expand Down
4 changes: 2 additions & 2 deletions minimisers/NS/runNestedSampler.m
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@
bayesResults.predictionIntervals = nestResults.predictionIntervals;
bayesResults.confidenceIntervals = nestResults.confidenceIntervals;
bayesResults.chain = chain;
bayesResults.nestedSamplerOutput.LogZ = logZ;
bayesResults.nestedSamplerOutput.LogZErr = sqrt(H / nLive);
bayesResults.nestedSamplerOutput.logZ = logZ;
bayesResults.nestedSamplerOutput.logZErr = sqrt(H / nLive);
bayesResults.nestedSamplerOutput.nestSamples = nestSamples;
bayesResults.nestedSamplerOutput.postSamples = postSamples;

Expand Down
6 changes: 3 additions & 3 deletions minimisers/generalUtils/makeEmptyBayesResultsStruct.m
Original file line number Diff line number Diff line change
Expand Up @@ -147,16 +147,16 @@
% (5) bayesResults.nestedSamplerOutput

% Nested Sampler
LogZ = 0;
LogZErr = 0;
logZ = 0;
logZErr = 0;

nestSamples = zeros(1,2);
coder.varsize('nestSamples');

postSamples = zeros(1,2);
coder.varsize('postSamples');

nestedSamplerOutput = struct('LogZ',LogZ,'LogZErr',LogZErr,...
nestedSamplerOutput = struct('logZ',logZ,'logZErr',logZErr,...
'nestSamples',nestSamples,'postSamples',postSamples);

% ------------------------------------------------------------------
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified tests/domainsTFReflectivityCalculation/domainsCustomXYInputs.mat
Binary file not shown.
Binary file modified tests/domainsTFReflectivityCalculation/domainsCustomXYOutputs.mat
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified tests/normalTFReflectivityCalculation/absorptionInputs.mat
Binary file not shown.
Binary file modified tests/normalTFReflectivityCalculation/absorptionOutputs.mat
Binary file not shown.
Binary file modified tests/normalTFReflectivityCalculation/absorptionTFParams.mat
Binary file not shown.
Binary file modified tests/normalTFReflectivityCalculation/customLayersInputs.mat
Binary file not shown.
Binary file modified tests/normalTFReflectivityCalculation/customLayersOutputs.mat
Binary file not shown.
Binary file modified tests/normalTFReflectivityCalculation/customLayersTFParams.mat
Binary file not shown.
Binary file modified tests/normalTFReflectivityCalculation/customXYInputs.mat
Binary file not shown.
Binary file modified tests/normalTFReflectivityCalculation/customXYOutputs.mat
Binary file not shown.
Binary file modified tests/normalTFReflectivityCalculation/customXYTFParams.mat
Binary file not shown.
Binary file modified tests/normalTFReflectivityCalculation/standardLayersInputs.mat
Binary file not shown.
Binary file modified tests/normalTFReflectivityCalculation/standardLayersOutputs.mat
Binary file not shown.
Binary file modified tests/normalTFReflectivityCalculation/standardLayersTFParams.mat
Binary file not shown.
Binary file modified tests/testProjectConversion/DSPCBilayerProjectClass.mat
Binary file not shown.
Binary file modified tests/testProjectConversion/monolayerVolumeModelProjectClass.mat
Binary file not shown.