Fixed bug in set_prior.m when correlations are estimated. Corrected description in header of prior_bounds.m

time-shift
Johannes Pfeifer 2012-09-14 18:00:12 +02:00
parent c74b1d1bdc
commit c2ce75aa45
2 changed files with 6 additions and 6 deletions

View File

@ -4,7 +4,7 @@ function bounds = prior_bounds(bayestopt,options)
%! @deftypefn {Function File} {@var{bounds} =} prior_bounds (@var{bayesopt},@var{option})
%! @anchor{prior_bounds}
%! @sp 1
%! Returns bounds for the prior densities. For each estimated parameter the upper and lower bounds
%! Returns bounds for the prior densities. For each estimated parameter the lower and upper bounds
%! are such that the defined intervals contains a probability mass equal to 1-2*@var{option}.prior_trunc. The
%! default value for @var{option}.prior_trunc is 1e-10 (set in @ref{global_initialization}).
%! @sp 2
@ -43,7 +43,7 @@ function bounds = prior_bounds(bayestopt,options)
% bayestopt [structure] characterizing priors (shape, mean, p1..p4)
%
% OUTPUTS
% bounds [double] matrix specifying prior bounds (row= parameter, column=upper&lower bound)
% bounds [double] matrix specifying prior bounds (row= parameter, column=lower&upper bound)
%
% SPECIAL REQUIREMENTS
% none

View File

@ -106,9 +106,9 @@ if ncx
bayestopt_.p3 = [ bayestopt_.p3; estim_params_.corrx(:,9)];
bayestopt_.p4 = [ bayestopt_.p4; estim_params_.corrx(:,10)];
bayestopt_.jscale = [ bayestopt_.jscale; estim_params_.corrx(:,11)];
bayestopt_.name = [bayestopt_.name; cellstr(['corr ' ...
bayestopt_.name = [bayestopt_.name; cellstr([repmat('corr ',ncx,1)...
deblank(M_.exo_names(estim_params_.corrx(:,1),:)) ...
', ' , deblank(M_.exo_names(estim_params_.corrx(:,2),:))])];
repmat(', ',ncx,1) , deblank(M_.exo_names(estim_params_.corrx(:,2),:))])];
end
if ncn
if isequal(M_.H,0)
@ -124,9 +124,9 @@ if ncn
bayestopt_.p3 = [ bayestopt_.p3; estim_params_.corrn(:,9)];
bayestopt_.p4 = [ bayestopt_.p4; estim_params_.corrn(:,10)];
bayestopt_.jscale = [ bayestopt_.jscale; estim_params_.corrn(:,11)];
bayestopt_.name = [bayestiopt_.name; cellstr(['corr ' ...
bayestopt_.name = [bayestopt_.name; cellstr([repmat('corr ',ncn,1) ...
deblank(M_.exo_names(estim_params_.corrn(:,1),:)) ...
', ' , deblank(M_.exo_names(estim_params_.corrn(:,2),:))])];
repmat(', ',ncn,1) , deblank(M_.exo_names(estim_params_.corrn(:,2),:))])];
end
if np
xparam1 = [xparam1; estim_params_.param_vals(:,2)];