diff --git a/matlab/dynare.m b/matlab/dynare.m index a8323cffab032aba1ad167a7fb9e4f2bc0fd538a..18efbeb5a0b0ddfdf92bc573ee003ede888c9111 100644 --- a/matlab/dynare.m +++ b/matlab/dynare.m @@ -16,7 +16,7 @@ function dynare(fname, varargin) % SPECIAL REQUIREMENTS % none -% Copyright (C) 2001-2018 Dynare Team +% Copyright (C) 2001-2019 Dynare Team % % This file is part of Dynare. % @@ -66,7 +66,7 @@ end check_matlab_path(change_path_flag); % Detect if MEX files are present; if not, use alternative M-files -dynareroot = dynare_config('', preprocessoroutput); +dynareroot = dynare_config(); warning_config() diff --git a/matlab/dynare_config.m b/matlab/dynare_config.m index 03fcf9f4995b34630416230d8397dd1d9be4575e..7ca935d045b63820885c381b4918a133d44b451f 100644 --- a/matlab/dynare_config.m +++ b/matlab/dynare_config.m @@ -1,5 +1,6 @@ -function dynareroot = dynare_config(path_to_dynare, verbose) - +function dynareroot = dynare_config(path_to_dynare) +%function dynareroot = dynare_config(path_to_dynare) +% % This function tests the existence of valid mex files (for qz % decomposition, solution to sylvester equation and kronecker % products...) and, if needed, add paths to the matlab versions @@ -15,7 +16,7 @@ function dynareroot = dynare_config(path_to_dynare, verbose) % SPECIAL REQUIREMENTS % none -% Copyright (C) 2001-2018 Dynare Team +% Copyright (C) 2001-2019 Dynare Team % % This file is part of Dynare. % @@ -41,10 +42,6 @@ dynareroot = strrep(which('dynare'),'dynare.m',''); origin = pwd(); cd([dynareroot '/..']) -if ~nargin || nargin==1 - verbose = 1; -end - p = {'/distributions/' ; ... '/kalman/' ; ... '/kalman/likelihood' ; ... diff --git a/matlab/internals.m b/matlab/internals.m index a7b96a81f8b194f5cd92030e533ef77c0ca243e2..a6238f1af2c66ddba4fb89373970b9163118afbc 100644 --- a/matlab/internals.m +++ b/matlab/internals.m @@ -79,7 +79,7 @@ more off if strcmpi(flag,'--test') if nargin>1 - dynare_path = dynare_config([],0); + dynare_path = dynare_config(); number_of_matlab_routines = length(varargin); for i=1:number_of_matlab_routines dtest(varargin{i},[dynare_path '..' filesep 'tests']); @@ -175,7 +175,7 @@ end if strcmpi(flag,'--info') if nargin==2 - dynare_config([],0); + dynare_config(); dynInfo(varargin{1}) else if nargin<2 diff --git a/matlab/missing/mex/local_state_space_iterations/local_state_space_iteration_2.m b/matlab/missing/mex/local_state_space_iterations/local_state_space_iteration_2.m index b63ad6c92b542ac0cf8682d81191dfa250b5c335..f272e5c27e778ec14dd78e3a8be3494e92f40217 100644 --- a/matlab/missing/mex/local_state_space_iterations/local_state_space_iteration_2.m +++ b/matlab/missing/mex/local_state_space_iterations/local_state_space_iteration_2.m @@ -207,14 +207,14 @@ end %$ cd(path_to_mex); %$ tar('local_state_space_iteration_2.tar',['local_state_space_iteration_2.' mexext]); %$ cd(where_am_i_coming_from); -%$ dynare_config([],0); +%$ dynare_config(); %$ y1b = local_state_space_iteration_2(yhat,epsilon,ghx,ghu,constant,ghxx,ghuu,ghxu,1); %$ [y2b,y2b_] = local_state_space_iteration_2(yhat,epsilon,ghx,ghu,constant,ghxx,ghuu,ghxu,yhat_,ss,1); %$ cd(path_to_mex); %$ untar('local_state_space_iteration_2.tar'); %$ delete('local_state_space_iteration_2.tar'); %$ cd(where_am_i_coming_from); -%$ dynare_config([],0); +%$ dynare_config(); %$ % Check the results. %$ t(1) = dassert(y1a,y1b); %$ t(2) = dassert(y2a,y2b); diff --git a/tests/run_all_unitary_tests.m b/tests/run_all_unitary_tests.m index 69cc074c9db2add42e7be0234aa7e6f33836bc05..62238e728f38abb75df1494af4a9d00781a3c5d2 100644 --- a/tests/run_all_unitary_tests.m +++ b/tests/run_all_unitary_tests.m @@ -1,4 +1,4 @@ -% Copyright (C) 2013-2017 Dynare Team +% Copyright (C) 2013-2019 Dynare Team % % This file is part of Dynare. % @@ -17,7 +17,7 @@ top_test_dir = getenv('TOP_TEST_DIR'); addpath([top_test_dir filesep '..' filesep 'matlab']); -dynare_config([], 0); +dynare_config(); if isoctave load_octave_packages diff --git a/tests/run_reporting_test_octave.m b/tests/run_reporting_test_octave.m index 35af5520f6744c394472aded9816a932807736c3..2fdc085f1ef1ddb32803e01ecc877b700ea31af7 100644 --- a/tests/run_reporting_test_octave.m +++ b/tests/run_reporting_test_octave.m @@ -1,4 +1,4 @@ -## Copyright (C) 2013-2017 Dynare Team +## Copyright (C) 2013-2019 Dynare Team ## ## This file is part of Dynare. ## @@ -31,7 +31,7 @@ endif putenv("GNUTERM", "dumb") ## To add default directories, empty dseries objects -dynare_config([], 0); +dynare_config(); printf("\n*** TESTING: run_reporting_test_octave.m ***\n"); try