make check: fix bug in check for license
parent
f01b0025e0
commit
9be84bdf65
|
@ -70,7 +70,8 @@ if ~exist('OCTAVE_VERSION')
|
||||||
addpath([dynareroot '/missing/rows_columns'])
|
addpath([dynareroot '/missing/rows_columns'])
|
||||||
% Replacement for vec() (inexistent under MATLAB)
|
% Replacement for vec() (inexistent under MATLAB)
|
||||||
addpath([dynareroot '/missing/vec'])
|
addpath([dynareroot '/missing/vec'])
|
||||||
if isempty(license('inuse','statistics_toolbox'))
|
[has_statistics_toolbox junk] = license('checkout','statistics_toolbox');
|
||||||
|
if ~has_statistics_toolbox
|
||||||
% Replacements for functions of the stats toolbox
|
% Replacements for functions of the stats toolbox
|
||||||
addpath([dynareroot '/missing/stats/'])
|
addpath([dynareroot '/missing/stats/'])
|
||||||
end
|
end
|
||||||
|
@ -100,7 +101,8 @@ if exist('OCTAVE_VERSION')
|
||||||
addpath([dynareroot '/missing/nanmean'])
|
addpath([dynareroot '/missing/nanmean'])
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
if isempty(license('inuse','statistics_toolbox'))
|
[has_statistics_toolbox junk] = license('checkout','statistics_toolbox');
|
||||||
|
if ~has_statistics_toolbox
|
||||||
addpath([dynareroot '/missing/nanmean'])
|
addpath([dynareroot '/missing/nanmean'])
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -262,4 +264,4 @@ if verbose
|
||||||
disp(' ')
|
disp(' ')
|
||||||
end
|
end
|
||||||
|
|
||||||
cd(origin);
|
cd(origin);
|
||||||
|
|
|
@ -38,8 +38,11 @@ global options_
|
||||||
options_ = set_default_option(options_,'solve_algo',2);
|
options_ = set_default_option(options_,'solve_algo',2);
|
||||||
info = 0;
|
info = 0;
|
||||||
if options_.solve_algo == 0
|
if options_.solve_algo == 0
|
||||||
if ~exist('OCTAVE_VERSION') && isempty(license('inuse','optimization_toolbox'))
|
if ~exist('OCTAVE_VERSION')
|
||||||
error('You can''t use solve_algo=0 since you don''t have MATLAB''s Optimization Toolbox')
|
[has_optimization_toolbox junk] = license('checkout','optimization_toolbox');
|
||||||
|
if ~has_optimization_toolbox
|
||||||
|
error('You can''t use solve_algo=0 since you don''t have MATLAB''s Optimization Toolbox')
|
||||||
|
end
|
||||||
end
|
end
|
||||||
options=optimset('fsolve');
|
options=optimset('fsolve');
|
||||||
options.MaxFunEvals = 50000;
|
options.MaxFunEvals = 50000;
|
||||||
|
|
|
@ -224,8 +224,11 @@ for it_=start:incr:finish
|
||||||
if (verbose == 1)
|
if (verbose == 1)
|
||||||
disp('steady: fsolve');
|
disp('steady: fsolve');
|
||||||
end
|
end
|
||||||
if ~exist('OCTAVE_VERSION') && ~license('test', 'optimization_toolbox')
|
if ~exist('OCTAVE_VERSION')
|
||||||
error('SOLVE_ONE_BOUNDARY: you can''t use solve_algo=0 since you don''t have MATLAB''s Optimization Toolbox')
|
[has_optimization_toolbox junk] = license('checkout','optimization_toolbox');
|
||||||
|
if ~has_optimization_toolbox
|
||||||
|
error('SOLVE_ONE_BOUNDARY: you can''t use solve_algo=0 since you don''t have MATLAB''s Optimization Toolbox')
|
||||||
|
end
|
||||||
end
|
end
|
||||||
options=optimset('fsolve');
|
options=optimset('fsolve');
|
||||||
options.MaxFunEvals = 50000;
|
options.MaxFunEvals = 50000;
|
||||||
|
|
|
@ -71,6 +71,7 @@ end
|
||||||
failedBlock = {};
|
failedBlock = {};
|
||||||
num_block_tests = 0;
|
num_block_tests = 0;
|
||||||
cd([top_test_dir '/block_bytecode']);
|
cd([top_test_dir '/block_bytecode']);
|
||||||
|
[has_optimization_toolbox junk] = license('checkout','optimization_toolbox');
|
||||||
for blockFlag = 0:1
|
for blockFlag = 0:1
|
||||||
for bytecodeFlag = 0:1
|
for bytecodeFlag = 0:1
|
||||||
default_solve_algo = 2;
|
default_solve_algo = 2;
|
||||||
|
@ -85,7 +86,7 @@ for blockFlag = 0:1
|
||||||
solve_algos = 1:8;
|
solve_algos = 1:8;
|
||||||
stack_solve_algos = 0:5;
|
stack_solve_algos = 0:5;
|
||||||
end
|
end
|
||||||
if license('test', 'optimization_toolbox')
|
if has_optimization_toolbox
|
||||||
solve_algos = [ solve_algos 0 ];
|
solve_algos = [ solve_algos 0 ];
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue