diff --git a/matlab/dynare_config.m b/matlab/dynare_config.m index a3813d406e65c719747d2fc5bdb6307713b3da8e..7dfdee6d7f2c2225b1b59361d798424aec7f77a3 100644 --- a/matlab/dynare_config.m +++ b/matlab/dynare_config.m @@ -66,7 +66,7 @@ if ~exist('OCTAVE_VERSION') addpath([dynareroot '/missing/rows_columns']) % Replacement for vec() (inexistent under MATLAB) addpath([dynareroot '/missing/vec']) - if isempty(ver('stats')) + if ~license('test', 'statistics_toolbox') % Replacements for functions of the stats toolbox addpath([dynareroot '/missing/stats/']) end diff --git a/matlab/dynare_solve.m b/matlab/dynare_solve.m index 104ac1450de5f1b57ceb618f2583b0d43f574eed..9e27df3eeaf7a389a65ca024268003c002dba3a6 100644 --- a/matlab/dynare_solve.m +++ b/matlab/dynare_solve.m @@ -38,7 +38,7 @@ global options_ options_ = set_default_option(options_,'solve_algo',2); info = 0; if options_.solve_algo == 0 - if ~exist('OCTAVE_VERSION') && isempty(ver('optim')) + if ~exist('OCTAVE_VERSION') && ~license('test', 'optimization_toolbox') error('You can''t use solve_algo=0 since you don''t have MATLAB''s Optimization Toolbox') end options=optimset('fsolve'); diff --git a/matlab/solve_one_boundary.m b/matlab/solve_one_boundary.m index 94de8110488540fbbd9c5546ce7ee5e52c5582d2..1b987ced1a35c3a6b3c78ffdd0393826b9401869 100644 --- a/matlab/solve_one_boundary.m +++ b/matlab/solve_one_boundary.m @@ -225,7 +225,7 @@ for it_=start:incr:finish if (verbose == 1) disp('steady: fsolve'); end - if exist('OCTAVE_VERSION') || isempty(ver('optim')) + if exist('OCTAVE_VERSION') || ~license('test', 'optimization_toolbox') % Note that fsolve() exists under Octave, but has a different syntax % So we fail for the moment under Octave, until we add the corresponding code error('DYNARE_SOLVE: you can''t use solve_algo=0 since you don''t have Matlab''s Optimization Toolbox')