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

make check: fix bug in check for license

time-shift
Houtan Bastani 2011-12-19 12:36:35 +01:00
parent f01b0025e0
commit 9be84bdf65
4 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
matlab/dynare_config.m
View File

@ -70,7 +70,8 @@ if ~exist('OCTAVE_VERSION')
addpath([dynareroot '/missing/rows_columns'])
% Replacement for vec() (inexistent under MATLAB)
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
addpath([dynareroot '/missing/stats/'])
end
@ -100,7 +101,8 @@ if exist('OCTAVE_VERSION')
addpath([dynareroot '/missing/nanmean'])
end
else
if isempty(license('inuse','statistics_toolbox'))
[has_statistics_toolbox junk] = license('checkout','statistics_toolbox');
if ~has_statistics_toolbox
addpath([dynareroot '/missing/nanmean'])
end
end
@ -262,4 +264,4 @@ if verbose
disp(' ')
end
cd(origin);
cd(origin);

7
matlab/dynare_solve.m
View File

@ -38,8 +38,11 @@ global options_
options_ = set_default_option(options_,'solve_algo',2);
info = 0;
if options_.solve_algo == 0
if ~exist('OCTAVE_VERSION') && isempty(license('inuse','optimization_toolbox'))
error('You can''t use solve_algo=0 since you don''t have MATLAB''s Optimization Toolbox')
if ~exist('OCTAVE_VERSION')
[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
options=optimset('fsolve');
options.MaxFunEvals = 50000;

7
matlab/solve_one_boundary.m
View File

@ -224,8 +224,11 @@ for it_=start:incr:finish
if (verbose == 1)
disp('steady: fsolve');
end
if ~exist('OCTAVE_VERSION') && ~license('test', 'optimization_toolbox')
error('SOLVE_ONE_BOUNDARY: you can''t use solve_algo=0 since you don''t have MATLAB''s Optimization Toolbox')
if ~exist('OCTAVE_VERSION')
[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
options=optimset('fsolve');
options.MaxFunEvals = 50000;

3
tests/run_test_matlab.m
View File

@ -71,6 +71,7 @@ end
failedBlock = {};
num_block_tests = 0;
cd([top_test_dir '/block_bytecode']);
[has_optimization_toolbox junk] = license('checkout','optimization_toolbox');
for blockFlag = 0:1
for bytecodeFlag = 0:1
default_solve_algo = 2;
@ -85,7 +86,7 @@ for blockFlag = 0:1
solve_algos = 1:8;
stack_solve_algos = 0:5;
end
if license('test', 'optimization_toolbox')
if has_optimization_toolbox
solve_algos = [ solve_algos 0 ];
end