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

Merge branch 'diplay' of git.dynare.org:JohannesPfeifer/dynare 

Ref. !1961
pac-components
Sébastien Villemot 2021-11-23 17:39:50 +01:00
parent 7542aaa59f 0aadc88602
commit 0bbf9f2d82
No known key found for this signature in database
GPG Key ID: 2CECE9350ECEBE4A
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
matlab/dynare_solve.m
View File

@ -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, ...

2
matlab/osr1.m
View File

@ -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,...