Clean up use of verbosity option

- in dr_block.m and ep_residuals.m the option was hardcoded and disabled
- for csminwel1.m, no verbosity option exists anymore, thus definitions preceeding calls to it were redundant as was the options_.osr.verbose
time-shift
Johannes Pfeifer 2014-09-10 18:23:47 +02:00 committed by Stéphane Adjemian (Charybdis)
parent bde4bb8232
commit 8655df67a9
7 changed files with 3 additions and 9 deletions

View File

@ -51,7 +51,7 @@ function [dr,info,M_,options_,oo_] = dr_block(dr,task,M_,options_,oo_)
% along with Dynare. If not, see <http://www.gnu.org/licenses/>.
info = 0;
verbose = 0;
verbose = options_.verbosity;
if options_.order > 1
error('2nd and 3rd order approximation not implemented with block option')
end

View File

@ -287,7 +287,6 @@ if ~isequal(options_.mode_compute,0) && ~options_.mh_posterior_mode_estimation
H0 = 1e-4*eye(nx);
crit = 1e-7;
nit = 1000;
verbose = 2;
numgrad = options_.gradient_method;
epsilon = options_.gradient_epsilon;
% Change some options.

View File

@ -34,7 +34,7 @@ function r = ep_residuals(x, y, ix, iy, steadystate, dr, maximum_lag, endo_nbr)
% You should have received a copy of the GNU General Public License
% along with Dynare. If not, see <http://www.gnu.org/licenses/>.
global oo_
global oo_ options_
persistent k1 k2 weight
@ -45,7 +45,7 @@ if isempty(k1)
weight = 0.0;
end
verbose = 0;
verbose = options_.ep.verbosity;
% Copy the shocks in exo_simul.
oo_.exo_simul(maximum_lag+1,ix) = exp(transpose(x));

View File

@ -626,7 +626,6 @@ options_.endogenous_prior_restrictions.moment={};
% OSR Optimal Simple Rules
options_.osr.tolf=1e-7;
options_.osr.maxit=1000;
options_.osr.verbose=2;
% use GPU
options_.gpu = 0;

View File

@ -36,7 +36,6 @@ number_of_estimated_parameters = length(iparams);
H0 = 1e-4*eye(number_of_estimated_parameters);
crit = 1e-7;
nit = 1000;
verbose = 2;
gradient_method = 2;
gradient_epsilon = 1e-6;

View File

@ -76,7 +76,6 @@ inv_order_var = oo_.dr.inv_order_var;
H0 = 1e-4*eye(np);
crit=options_.osr.tolf;
nit=options_.osr.maxit;
verbose=options_.osr.verbose;
%% do initial checks
[loss,vx,info,exit_flag]=osr_obj(t0,i_params,inv_order_var(i_var),weights(i_var,i_var));

View File

@ -55,8 +55,6 @@ persistent init_flag mf0 mf1
persistent nodes2 weights2 weights_c2 number_of_particles
persistent sample_size number_of_state_variables number_of_observed_variables
verbose = 1;
% Set default
if isempty(start)
start = 1;