From a5ab2d0d4f2f0f5da3d79b13b90ac1754b12c2ea Mon Sep 17 00:00:00 2001 From: Marco Ratto <marco.ratto@jrc.ec.europa.eu> Date: Thu, 15 Mar 2012 15:59:59 +0100 Subject: [PATCH] fixed bug related to clear priordens; --- matlab/evaluate_likelihood.m | 7 ++----- matlab/evaluate_prior.m | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/matlab/evaluate_likelihood.m b/matlab/evaluate_likelihood.m index 7e7a6b3be..cf044bdad 100644 --- a/matlab/evaluate_likelihood.m +++ b/matlab/evaluate_likelihood.m @@ -134,10 +134,7 @@ if isempty(load_data) load_data = 1; end -pshape_original = bayestopt_.pshape; -bayestopt_.pshape = Inf(size(bayestopt_.pshape)); -clear('priordens')% - llik = -DsgeLikelihood(parameters,gend,data,data_index,number_of_observations,no_more_missing_observations); +ldens = evaluate_prior(parameters); +llik = llik - ldens; -bayestopt_.pshape = pshape_original; \ No newline at end of file diff --git a/matlab/evaluate_prior.m b/matlab/evaluate_prior.m index db24e28ac..599be0cca 100644 --- a/matlab/evaluate_prior.m +++ b/matlab/evaluate_prior.m @@ -61,5 +61,5 @@ if ischar(parameters) error end end -clear('priordens'); + ldens = priordens(parameters, bayestopt_.pshape, bayestopt_.p6, bayestopt_.p7, bayestopt_.p3, bayestopt_.p4); \ No newline at end of file -- GitLab