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

Merge remote-tracking branch 'ratto/master'

time-shift
Sébastien Villemot 2011-10-27 11:14:17 +02:00
parent 4cbe2d4634 dde9d2bfee
commit 2c2fb63a11
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_config.m
View File

@ -66,7 +66,7 @@ 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 ~license('test', 'statistics_toolbox') if isempty(license('inuse','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
@ -96,7 +96,7 @@ if exist('OCTAVE_VERSION')
addpath([dynareroot '/missing/nanmean']) addpath([dynareroot '/missing/nanmean'])
end end
else else
if ~license('test', 'statistics_toolbox') if isempty(license('inuse','statistics_toolbox'))
addpath([dynareroot '/missing/nanmean']) addpath([dynareroot '/missing/nanmean'])
end end
end end

2
matlab/dynare_solve.m
View File

@ -38,7 +38,7 @@ 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') && ~license('test', 'optimization_toolbox') 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') error('You can''t use solve_algo=0 since you don''t have MATLAB''s Optimization Toolbox')
end end
options=optimset('fsolve'); options=optimset('fsolve');