From c1b0bb5ee3d5d641b4cca39d18a488e760114268 Mon Sep 17 00:00:00 2001 From: Johannes Pfeifer Date: Wed, 14 Nov 2018 15:02:15 +0100 Subject: [PATCH 1/2] initial_estimation_checks.m: Turn vector info into scalar Related to https://git.dynare.org/Dynare/dynare/commit/a5b97a28a0e26fb2448d6dcf37bdcd125e175b40 that needs to be reverted --- matlab/initial_estimation_checks.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/matlab/initial_estimation_checks.m b/matlab/initial_estimation_checks.m index 05972ef30..1ef5b7a22 100644 --- a/matlab/initial_estimation_checks.m +++ b/matlab/initial_estimation_checks.m @@ -106,7 +106,7 @@ end test_for_deep_parameters_calibration(Model); [lnprior,~,~,info]= priordens(xparam1,BayesInfo.pshape,BayesInfo.p6,BayesInfo.p7,BayesInfo.p3,BayesInfo.p4); -if info +if any(info) fprintf('The prior density evaluated at the initial values is Inf for the following parameters: %s\n',BayesInfo.name{info,1}) error('The initial value of the prior is -Inf') end From 09a166f4e7533d50b4e1d3c978907491960c23c7 Mon Sep 17 00:00:00 2001 From: Johannes Pfeifer Date: Wed, 14 Nov 2018 15:04:27 +0100 Subject: [PATCH 2/2] Revert "adding missing any()" This reverts commit a5b97a28a0e26fb2448d6dcf37bdcd125e175b40. --- matlab/priordens.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/matlab/priordens.m b/matlab/priordens.m index 632b86d83..b988e7ea1 100644 --- a/matlab/priordens.m +++ b/matlab/priordens.m @@ -144,7 +144,7 @@ if tt5 if any(x(id5)-p3(id5)<0) || any(x(id5)-p4(id5)>0) logged_prior_density = -Inf ; if nargout ==4 - info=id5(any(x(id5)-p3(id5)<0) || any(x(id5)-p4(id5)>0)); + info=id5((x(id5)-p3(id5)<0) || (x(id5)-p4(id5)>0)); end return end