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

Merge pull request #1007 from JohannesPfeifer/ml_use_calibration 

Filter out non-fully calibrated model when use_calibration is used wi…
time-shift
MichelJuillard 2015-07-31 11:34:28 +02:00
parent caa04fb251 64889b7335
commit 7567c04421
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
matlab/dynare_estimation_init.m
View File

@ -301,7 +301,11 @@ else
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
if ~isempty(bayestopt_) && all(bayestopt_.pshape==0) && any(all(isnan([xparam1_calib xparam1]),2))
error('Estimation: When using the use_calibration option with ML, the parameters must be properly initialized.')
else
[xparam1,estim_params_]=do_parameter_initialization(estim_params_,xparam1_calib,xparam1); %get explicitly initialized parameters that have precedence to calibrated values
end
end
if ~isempty(estim_params_) && ~all(strcmp(fieldnames(estim_params_),'full_calibration_detected'))