stepan
/
dynare
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #980 from JohannesPfeifer/master 

Further fixes after PR
time-shift
Houtan Bastani 2015-07-21 17:17:26 +02:00
parent 1fd63b0dd2 06bd20214e
commit 46c5d5d4db
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
matlab/dynare_estimation_init.m
View File

@ -293,15 +293,15 @@ end
%%read out calibration that was set in mod-file and can be used for initialization
xparam1_calib=get_all_parameters(estim_params_,M_); %get calibrated parameters
if ~any(isnan(xparam1_calib)) %all estimated parameters are calibrated
estim_params_.full_calibration_detected.full_calibration_detected=1;
estim_params_.full_calibration_detected=1;
else
estim_params_.full_calibration_detected.full_calibration_detected=0;
estim_params_.full_calibration_detected=0;
end
if options_.use_calibration_initialization %set calibration as starting values
[xparam1,estim_params_]=do_parameter_initialization(estim_params_,xparam1_calib,xparam1); %get explicitly initialized parameters that have precedence to calibrated values
end
if ~isempty(estim_params_) && ~strmatch(fieldnames(estim_params_),'full_calibration_detected')
if ~isempty(estim_params_) && ~all(strcmp(fieldnames(estim_params_),'full_calibration_detected'))
if ~isempty(bayestopt_) && any(bayestopt_.pshape > 0)
% Plot prior densities.
if ~options_.nograph && options_.plot_priors
@ -332,7 +332,7 @@ if ~isempty(estim_params_) && ~strmatch(fieldnames(estim_params_),'full_calibrat
end
end
if isempty(estim_params_) || strmatch(fieldnames(estim_params_),'full_calibration_detected')% If estim_params_ is empty (e.g. when running the smoother on a calibrated model)
if isempty(estim_params_) || all(strcmp(fieldnames(estim_params_),'full_calibration_detected'))% If estim_params_ is empty (e.g. when running the smoother on a calibrated model)
if ~options_.smoother
error('Estimation: the ''estimated_params'' block is mandatory (unless you are running a smoother)')
end

2
tests/estimation/fs2000_initialize_from_calib.mod
View File

@ -59,8 +59,10 @@ end;
shocks;
var e_a; stderr 0.014;
var e_m; stderr 0.005;
var e_f; stderr 0.0001;
corr gy_obs, gp_obs = 0.1;
var gy_obs; stderr 0.005;
var gp_obs; stderr 0.005;
end;
steady;