From 4aaea53cd61b5d31703e00ec16f3eb8da3f71514 Mon Sep 17 00:00:00 2001 From: Johannes Pfeifer Date: Tue, 23 Nov 2021 12:41:04 +0100 Subject: [PATCH 1/2] osr1.m: fix display of compatible optimizers --- matlab/osr1.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/matlab/osr1.m b/matlab/osr1.m index 4ccbbdb16..98bd772b1 100644 --- a/matlab/osr1.m +++ b/matlab/osr1.m @@ -120,7 +120,7 @@ elseif isequal(options_.osr.opt_algo,11) else if ~isempty(M_.osr.param_bounds) && ~(ismember(options_.osr.opt_algo,[1,2,5,9]) || ischar(options_.osr.opt_algo)) - error('OSR: OSR with bounds on parameters requires a constrained optimizer, i.e. opt_algo= 1,2,5, or 9.') + error('OSR: OSR with bounds on parameters requires a constrained optimizer, i.e. opt_algo= 1,2 or 9.') end %%do actual optimization [p, f] = dynare_minimize_objective(str2func('osr_obj'),t0,options_.osr.opt_algo,options_,M_.osr.param_bounds,M_.param_names(i_params),[],[], i_params,... From 0aadc8860270a55b54a50f495b1146b5e8526318 Mon Sep 17 00:00:00 2001 From: Johannes Pfeifer Date: Tue, 23 Nov 2021 12:41:35 +0100 Subject: [PATCH 2/2] dynare_solve.m: allow turning off display of messages --- matlab/dynare_solve.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/matlab/dynare_solve.m b/matlab/dynare_solve.m index bd20cdad7..2fd4b7c9a 100644 --- a/matlab/dynare_solve.m +++ b/matlab/dynare_solve.m @@ -95,7 +95,7 @@ if jacobian_flag info = 0; return; end - disp('Randomize initial guess...') + disp_verbose('Randomize initial guess...',options.verbosity) % Let's try random numbers for the variables initialized with the default value. wrong_initial_guess_flag = true; % First try with positive numbers. @@ -323,7 +323,7 @@ elseif ismember(options.solve_algo, [2, 12, 4]) end fvec = feval(f, x, arguments{:}); if max(abs(fvec))>tolf - disp('Call solver on the full nonlinear problem.') + disp_verbose('Call solver on the full nonlinear problem.',options.verbosity) [x, errorflag] = solver(f, x, 1:nn, 1:nn, jacobian_flag, ... options.gstep, tolf, options.solve_tolx, maxit, ... options.trust_region_initial_step_bound_factor, ...