From 79c5e18bfe92ff9264544d665807fb664aeb5095 Mon Sep 17 00:00:00 2001 From: Johannes Pfeifer Date: Fri, 19 Sep 2014 16:20:43 +0200 Subject: [PATCH] Cosmetic changes - Suppresses spurious output from dynare_estimation_1.m - Removes unset output argument from dynare_estimation_init.m (which seems to be totally unused as it was not set at all and nobody reported any crashes) - Corrects header of dynare_estimation_init.m --- matlab/dynare_estimation_1.m | 3 --- matlab/dynare_estimation_init.m | 35 ++++++++++++++++++++++----------- 2 files changed, 24 insertions(+), 14 deletions(-) diff --git a/matlab/dynare_estimation_1.m b/matlab/dynare_estimation_1.m index 158558472..03992f2f1 100644 --- a/matlab/dynare_estimation_1.m +++ b/matlab/dynare_estimation_1.m @@ -977,9 +977,6 @@ if (~((any(bayestopt_.pshape > 0) && options_.mh_replic) || (any(bayestopt_.psha if options_.prefilter == 1 yf = atT(bayestopt_.mf,:)+repmat(dataset_info.descriptive.mean',1,gend); elseif options_.loglinear == 1 - gend - bayestopt_.mfys - ys yf = atT(bayestopt_.mf,:)+repmat(log(ys(bayestopt_.mfys)),1,gend)+... trend_coeff*[1:gend]; else diff --git a/matlab/dynare_estimation_init.m b/matlab/dynare_estimation_init.m index 3c8fef0a8..41c64e800 100644 --- a/matlab/dynare_estimation_init.m +++ b/matlab/dynare_estimation_init.m @@ -1,24 +1,37 @@ -function [dataset_, dataset_info, xparam1, hh, M_, options_, oo_, estim_params_,bayestopt_, fake] = dynare_estimation_init(var_list_, dname, gsa_flag, M_, options_, oo_, estim_params_, bayestopt_) +function [dataset_, dataset_info, xparam1, hh, M_, options_, oo_, estim_params_,bayestopt_] = dynare_estimation_init(var_list_, dname, gsa_flag, M_, options_, oo_, estim_params_, bayestopt_) % function dynare_estimation_init(var_list_, gsa_flag) % preforms initialization tasks before estimation or % global sensitivity analysis % % INPUTS -% var_list_: selected endogenous variables vector -% dname: alternative directory name -% gsa_flag: flag for GSA operation (optional) -% +% var_list_: selected endogenous variables vector +% dname: alternative directory name +% gsa_flag: flag for GSA operation (optional) +% M_: structure storing the model information +% options_: structure storing the options +% oo_: structure storing the results +% estim_params_: structure storing information about estimated +% parameters +% bayestopt_: structure storing information about priors + % OUTPUTS -% data: data after required transformation -% rawdata: data as in the data file -% xparam1: initial value of estimated parameters as returned by -% set_prior() -% +% dataset_: the dataset after required transformation +% dataset_info: Various informations about the dataset (descriptive statistics and missing observations). +% xparam1: initial value of estimated parameters as returned by +% set_prior() or loaded from mode-file +% hh: hessian matrix at the loaded mode (or empty matrix) +% M_: structure storing the model information +% options_: structure storing the options +% oo_: structure storing the results +% estim_params_: structure storing information about estimated +% parameters +% bayestopt_: structure storing information about priors +% % SPECIAL REQUIREMENTS % none -% Copyright (C) 2003-2013 Dynare Team +% Copyright (C) 2003-2014 Dynare Team % % This file is part of Dynare. %