Commit bc155fd0 authored by Stéphane Adjemian (Scylla)'s avatar Stéphane Adjemian (Scylla)
Browse files

Changed calling sequence of prior_draw.m.

parent b16c56b7
......@@ -55,13 +55,12 @@ SampleSize = options_ident.prior_mc;
% results = prior_sampler(0,M_,bayestopt_,options_,oo_);
bbb=bayestopt_;
if options_ident.prior_range
bbb.pshape = ones(size(bbb.pshape))*5;
bbb.p3=bbb.lb;
bbb.p4=bbb.ub;
prior_draw(1,1);
else
prior_draw(1);
end
prior_draw(1,bbb);
if ~(exist('sylvester3mr','file')==2),
dynareroot = strrep(which('dynare'),'dynare.m','');
......
function pdraw = prior_draw(init, prior_structure)
function pdraw = prior_draw(init,uniform)
% This function generate one draw from the joint prior distribution.
%
% INPUTS
% o init [integer] scalar equal to 1 (first call) or 0.
% o prior_structure [structure] Describes the prior distribution [bayestopt_]
%
% o uniform [integer] scalar equal to 1 (first call) or 0.
%
% OUTPUTS
% o pdraw [double] 1*npar vector, draws from the joint prior density.
%
......@@ -38,43 +38,53 @@ persistent uniform_draws gaussian_draws gamma_draws beta_draws inverse_gamma_1_d
if nargin>0 && init
p6 = prior_structure.p6;
p7 = prior_structure.p7;
p3 = prior_structure.p3;
p4 = prior_structure.p4;
lb = prior_structure.lb;
ub = prior_structure.ub;
prior_shape = prior_structure.pshape ;
p6 = evalin('base', 'bayestopt_.p6');
p7 = evalin('base', 'bayestopt_.p7');
p3 = evalin('base', 'bayestopt_.p3');
p4 = evalin('base', 'bayestopt_.p4');
lb = evalin('base', 'bayestopt_.lb');
ub = evalin('base', 'bayestopt_.ub');
number_of_estimated_parameters = length(p6);
if nargin>1 && uniform
prior_shape = repmat(5,number_of_estimated_parameters,1);
else
prior_shape = evalin('base', 'bayestopt_.pshape');
end
beta_index = find(prior_shape==1);
beta_draws = 1;
if isempty(beta_index)
beta_draws = 0;
else
beta_draws = 1;
end
gamma_index = find(prior_shape==2);
gamma_draws = 1;
if isempty(gamma_index)
gamma_draws = 0;
else
gamma_draws = 1;
end
gaussian_index = find(prior_shape==3);
gaussian_draws = 1;
if isempty(gaussian_index)
gaussian_draws = 0;
else
gaussian_draws = 1;
end
inverse_gamma_1_index = find(prior_shape==4);
inverse_gamma_1_draws = 1;
if isempty(inverse_gamma_1_index)
inverse_gamma_1_draws = 0;
else
inverse_gamma_1_draws = 1;
end
uniform_index = find(prior_shape==5);
uniform_draws = 1;
if isempty(uniform_index)
uniform_draws = 0;
else
uniform_draws = 1;
end
inverse_gamma_2_index = find(prior_shape==6);
inverse_gamma_2_draws = 1;
if isempty(inverse_gamma_2_index)
inverse_gamma_2_draws = 0;
else
inverse_gamma_2_draws = 1;
end
pdraw = zeros(number_of_estimated_parameters,1);
return
......
......@@ -31,7 +31,7 @@ function results = prior_sampler(drsave,M_,bayestopt_,options_,oo_)
% along with Dynare. If not, see <http://www.gnu.org/licenses/>.
% Initialization.
prior_draw(1,bayestopt_);
prior_draw(1);
PriorDirectoryName = CheckPath('prior/draws');
work = ~drsave;
iteration = 0;
......
......@@ -266,3 +266,6 @@ end
% initialize persistent variables in priordens()
priordens(xparam1,bayestopt_.pshape,bayestopt_.p6,bayestopt_.p7, ...
bayestopt_.p3,bayestopt_.p4,1);
% Put bayestopt_ in matlab's workspace
assignin('base','bayestopt_',bayestopt_);
\ No newline at end of file
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment