Commit c07a915d authored by Sébastien Villemot's avatar Sébastien Villemot Committed by Stéphane Adjemian
Browse files

Improve the way we test for existence of toolboxes (more reliable in the case...

Improve the way we test for existence of toolboxes (more reliable in the case where the toolbox is installed but not activated)
parent 013c599e
......@@ -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
......
......@@ -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');
......
......@@ -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')
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment