diff --git a/API/RAT.m b/API/RAT.m index 67afd278e..61a4c58cc 100644 --- a/API/RAT.m +++ b/API/RAT.m @@ -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. % =================== ==================== =============== diff --git a/minimisers/NS/runNestedSampler.m b/minimisers/NS/runNestedSampler.m index 704622919..0a8310e72 100644 --- a/minimisers/NS/runNestedSampler.m +++ b/minimisers/NS/runNestedSampler.m @@ -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; diff --git a/minimisers/generalUtils/makeEmptyBayesResultsStruct.m b/minimisers/generalUtils/makeEmptyBayesResultsStruct.m index c1fb4b9c6..66d3cf2ea 100644 --- a/minimisers/generalUtils/makeEmptyBayesResultsStruct.m +++ b/minimisers/generalUtils/makeEmptyBayesResultsStruct.m @@ -147,8 +147,8 @@ % (5) bayesResults.nestedSamplerOutput % Nested Sampler - LogZ = 0; - LogZErr = 0; + logZ = 0; + logZErr = 0; nestSamples = zeros(1,2); coder.varsize('nestSamples'); @@ -156,7 +156,7 @@ postSamples = zeros(1,2); coder.varsize('postSamples'); - nestedSamplerOutput = struct('LogZ',LogZ,'LogZErr',LogZErr,... + nestedSamplerOutput = struct('logZ',logZ,'logZErr',logZErr,... 'nestSamples',nestSamples,'postSamples',postSamples); % ------------------------------------------------------------------ diff --git a/tests/domainsTFReflectivityCalculation/domainsCustomLayersInputs.mat b/tests/domainsTFReflectivityCalculation/domainsCustomLayersInputs.mat index ecf88eaaa..f9267d274 100644 Binary files a/tests/domainsTFReflectivityCalculation/domainsCustomLayersInputs.mat and b/tests/domainsTFReflectivityCalculation/domainsCustomLayersInputs.mat differ diff --git a/tests/domainsTFReflectivityCalculation/domainsCustomLayersOutputs.mat b/tests/domainsTFReflectivityCalculation/domainsCustomLayersOutputs.mat index abd6d9988..180cd5762 100644 Binary files a/tests/domainsTFReflectivityCalculation/domainsCustomLayersOutputs.mat and b/tests/domainsTFReflectivityCalculation/domainsCustomLayersOutputs.mat differ diff --git a/tests/domainsTFReflectivityCalculation/domainsCustomLayersTFParams.mat b/tests/domainsTFReflectivityCalculation/domainsCustomLayersTFParams.mat index 3f37b58fe..3599cfc9f 100644 Binary files a/tests/domainsTFReflectivityCalculation/domainsCustomLayersTFParams.mat and b/tests/domainsTFReflectivityCalculation/domainsCustomLayersTFParams.mat differ diff --git a/tests/domainsTFReflectivityCalculation/domainsCustomXYInputs.mat b/tests/domainsTFReflectivityCalculation/domainsCustomXYInputs.mat index 345186e46..dc096fff1 100644 Binary files a/tests/domainsTFReflectivityCalculation/domainsCustomXYInputs.mat and b/tests/domainsTFReflectivityCalculation/domainsCustomXYInputs.mat differ diff --git a/tests/domainsTFReflectivityCalculation/domainsCustomXYOutputs.mat b/tests/domainsTFReflectivityCalculation/domainsCustomXYOutputs.mat index d1346a8d6..1fa8158f7 100644 Binary files a/tests/domainsTFReflectivityCalculation/domainsCustomXYOutputs.mat and b/tests/domainsTFReflectivityCalculation/domainsCustomXYOutputs.mat differ diff --git a/tests/domainsTFReflectivityCalculation/domainsCustomXYTFParams.mat b/tests/domainsTFReflectivityCalculation/domainsCustomXYTFParams.mat index 8e757093d..f1437b731 100644 Binary files a/tests/domainsTFReflectivityCalculation/domainsCustomXYTFParams.mat and b/tests/domainsTFReflectivityCalculation/domainsCustomXYTFParams.mat differ diff --git a/tests/domainsTFReflectivityCalculation/domainsStandardLayersInputs.mat b/tests/domainsTFReflectivityCalculation/domainsStandardLayersInputs.mat index 051891dc2..5839b50e6 100644 Binary files a/tests/domainsTFReflectivityCalculation/domainsStandardLayersInputs.mat and b/tests/domainsTFReflectivityCalculation/domainsStandardLayersInputs.mat differ diff --git a/tests/domainsTFReflectivityCalculation/domainsStandardLayersOutputs.mat b/tests/domainsTFReflectivityCalculation/domainsStandardLayersOutputs.mat index 9bc452c5b..1e910a512 100644 Binary files a/tests/domainsTFReflectivityCalculation/domainsStandardLayersOutputs.mat and b/tests/domainsTFReflectivityCalculation/domainsStandardLayersOutputs.mat differ diff --git a/tests/domainsTFReflectivityCalculation/domainsStandardLayersTFParams.mat b/tests/domainsTFReflectivityCalculation/domainsStandardLayersTFParams.mat index 6bffb821b..9cb99509d 100644 Binary files a/tests/domainsTFReflectivityCalculation/domainsStandardLayersTFParams.mat and b/tests/domainsTFReflectivityCalculation/domainsStandardLayersTFParams.mat differ diff --git a/tests/normalTFReflectivityCalculation/absorptionInputs.mat b/tests/normalTFReflectivityCalculation/absorptionInputs.mat index 565669cb7..d36cf8b08 100644 Binary files a/tests/normalTFReflectivityCalculation/absorptionInputs.mat and b/tests/normalTFReflectivityCalculation/absorptionInputs.mat differ diff --git a/tests/normalTFReflectivityCalculation/absorptionOutputs.mat b/tests/normalTFReflectivityCalculation/absorptionOutputs.mat index b3306609e..dd81ab798 100644 Binary files a/tests/normalTFReflectivityCalculation/absorptionOutputs.mat and b/tests/normalTFReflectivityCalculation/absorptionOutputs.mat differ diff --git a/tests/normalTFReflectivityCalculation/absorptionTFParams.mat b/tests/normalTFReflectivityCalculation/absorptionTFParams.mat index 5ed578ec7..704fb76a0 100644 Binary files a/tests/normalTFReflectivityCalculation/absorptionTFParams.mat and b/tests/normalTFReflectivityCalculation/absorptionTFParams.mat differ diff --git a/tests/normalTFReflectivityCalculation/customLayersInputs.mat b/tests/normalTFReflectivityCalculation/customLayersInputs.mat index e5b3efb6b..0dc110389 100644 Binary files a/tests/normalTFReflectivityCalculation/customLayersInputs.mat and b/tests/normalTFReflectivityCalculation/customLayersInputs.mat differ diff --git a/tests/normalTFReflectivityCalculation/customLayersOutputs.mat b/tests/normalTFReflectivityCalculation/customLayersOutputs.mat index 1e6a1d9ce..85763ac22 100644 Binary files a/tests/normalTFReflectivityCalculation/customLayersOutputs.mat and b/tests/normalTFReflectivityCalculation/customLayersOutputs.mat differ diff --git a/tests/normalTFReflectivityCalculation/customLayersTFParams.mat b/tests/normalTFReflectivityCalculation/customLayersTFParams.mat index d76cf7126..47cfd09d5 100644 Binary files a/tests/normalTFReflectivityCalculation/customLayersTFParams.mat and b/tests/normalTFReflectivityCalculation/customLayersTFParams.mat differ diff --git a/tests/normalTFReflectivityCalculation/customXYInputs.mat b/tests/normalTFReflectivityCalculation/customXYInputs.mat index dfa00e83a..4ce49da31 100644 Binary files a/tests/normalTFReflectivityCalculation/customXYInputs.mat and b/tests/normalTFReflectivityCalculation/customXYInputs.mat differ diff --git a/tests/normalTFReflectivityCalculation/customXYOutputs.mat b/tests/normalTFReflectivityCalculation/customXYOutputs.mat index 0150e65f7..9104c9518 100644 Binary files a/tests/normalTFReflectivityCalculation/customXYOutputs.mat and b/tests/normalTFReflectivityCalculation/customXYOutputs.mat differ diff --git a/tests/normalTFReflectivityCalculation/customXYTFParams.mat b/tests/normalTFReflectivityCalculation/customXYTFParams.mat index c0d4e3202..c0a44bc46 100644 Binary files a/tests/normalTFReflectivityCalculation/customXYTFParams.mat and b/tests/normalTFReflectivityCalculation/customXYTFParams.mat differ diff --git a/tests/normalTFReflectivityCalculation/standardLayersInputs.mat b/tests/normalTFReflectivityCalculation/standardLayersInputs.mat index 3aa296b9d..4a4528987 100644 Binary files a/tests/normalTFReflectivityCalculation/standardLayersInputs.mat and b/tests/normalTFReflectivityCalculation/standardLayersInputs.mat differ diff --git a/tests/normalTFReflectivityCalculation/standardLayersOutputs.mat b/tests/normalTFReflectivityCalculation/standardLayersOutputs.mat index 2da682c61..c06e873b0 100644 Binary files a/tests/normalTFReflectivityCalculation/standardLayersOutputs.mat and b/tests/normalTFReflectivityCalculation/standardLayersOutputs.mat differ diff --git a/tests/normalTFReflectivityCalculation/standardLayersTFParams.mat b/tests/normalTFReflectivityCalculation/standardLayersTFParams.mat index 9aecf5fdb..cc1b71d4d 100644 Binary files a/tests/normalTFReflectivityCalculation/standardLayersTFParams.mat and b/tests/normalTFReflectivityCalculation/standardLayersTFParams.mat differ diff --git a/tests/testProjectConversion/DSPCBilayerProjectClass.mat b/tests/testProjectConversion/DSPCBilayerProjectClass.mat index ae9501c4e..fd8d35197 100644 Binary files a/tests/testProjectConversion/DSPCBilayerProjectClass.mat and b/tests/testProjectConversion/DSPCBilayerProjectClass.mat differ diff --git a/tests/testProjectConversion/monolayerVolumeModelProjectClass.mat b/tests/testProjectConversion/monolayerVolumeModelProjectClass.mat index 0a1077881..5f4c39226 100644 Binary files a/tests/testProjectConversion/monolayerVolumeModelProjectClass.mat and b/tests/testProjectConversion/monolayerVolumeModelProjectClass.mat differ