diff --git a/m4/ax_mexopts.m4 b/m4/ax_mexopts.m4 index 0d9a93a8f..514e3283c 100644 --- a/m4/ax_mexopts.m4 +++ b/m4/ax_mexopts.m4 @@ -22,7 +22,7 @@ AC_REQUIRE([AX_MATLAB_ARCH]) AC_REQUIRE([AX_MATLAB_VERSION]) AC_REQUIRE([AC_PROG_SED]) -AX_COMPARE_VERSION([$MATLAB_VERSION], [lt], [7.5], [AC_MSG_ERROR([Your MATLAB is too old, please upgrade to 7.5 (R2007b) at least.])]) +AX_COMPARE_VERSION([$MATLAB_VERSION], [lt], [7.9], [AC_MSG_ERROR([Your MATLAB is too old, please upgrade to 7.9 (R2009b) at least.])]) AC_MSG_CHECKING([for options to compile MEX for MATLAB]) diff --git a/matlab/dynare.m b/matlab/dynare.m index 00f18c377..85c9a50a1 100644 --- a/matlab/dynare.m +++ b/matlab/dynare.m @@ -82,6 +82,7 @@ if isoctave 'of models approximated at third order, will not be available.'], supported_octave_version()) skipline() elseif octave_ver_less_than('4.2') % Should match the test in mex/build/octave/configure.ac + % and in m4/ax_mexopts.m4 skipline() warning(['This version of Dynare has only been tested on Octave 4.2 and above. Dynare may fail to run or give unexpected result. Consider upgrading your version of Octave.']) skipline() diff --git a/matlab/get_dynare_random_generator_state.m b/matlab/get_dynare_random_generator_state.m index b2789b054..bf01db4a5 100644 --- a/matlab/get_dynare_random_generator_state.m +++ b/matlab/get_dynare_random_generator_state.m @@ -23,7 +23,7 @@ function [state_u,state_n] = get_dynare_random_generator_state() % You should have received a copy of the GNU General Public License % along with Dynare. If not, see . -matlab_random_streams = ~(isoctave || matlab_ver_less_than('7.7')); +matlab_random_streams = ~isoctave; if matlab_random_streams% Use new matlab interface. if matlab_ver_less_than('7.12') diff --git a/matlab/set_dynare_random_generator_state.m b/matlab/set_dynare_random_generator_state.m index a06fdff5d..8854576d9 100644 --- a/matlab/set_dynare_random_generator_state.m +++ b/matlab/set_dynare_random_generator_state.m @@ -23,7 +23,7 @@ function [state_u,state_n] = set_dynare_random_generator_state(state_u,state_n) % You should have received a copy of the GNU General Public License % along with Dynare. If not, see . -matlab_random_streams = ~(isoctave || matlab_ver_less_than('7.7')); +matlab_random_streams = ~isoctave; if matlab_random_streams% Use new matlab interface. if matlab_ver_less_than('7.12') diff --git a/matlab/set_dynare_seed.m b/matlab/set_dynare_seed.m index 65c5e0587..89feb1961 100644 --- a/matlab/set_dynare_seed.m +++ b/matlab/set_dynare_seed.m @@ -24,7 +24,7 @@ if ~nargin error('set_dynare_seed:: I need at least one input argument!') end -matlab_random_streams = ~(isoctave || matlab_ver_less_than('7.7') || options_.parallel_info.isHybridMatlabOctave); +matlab_random_streams = ~(isoctave || options_.parallel_info.isHybridMatlabOctave); if matlab_random_streams% Use new matlab interface. if nargin==1 diff --git a/windows/README.txt b/windows/README.txt index 094b88ecb..67f1d5681 100644 --- a/windows/README.txt +++ b/windows/README.txt @@ -25,7 +25,7 @@ NOTE: Dynare comes with an automated uninstaller, which you can run from the Using Dynare with MATLAB (R) ---------------------------- -Dynare requires MATLAB (R) version 7.5 (R2007b) or above. With older versions +Dynare requires MATLAB (R) version 7.9 (R2009b) or above. With older versions of MATLAB (R), it may fail or give unexpected results. To use Dynare, you just have to add the 'matlab' subdirectory of your Dynare