diff --git a/m4/ax_mexopts.m4 b/m4/ax_mexopts.m4 index 0d9a93a8fae79b40d5f7848f214809d3e718387a..514e3283cdbf962f4c2424ec174d2fcb6b115feb 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 00f18c37725237027c5d26ba4a565eabe033f99b..85c9a50a11b2f78f2a259a2704a5ba06385706a6 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 b2789b054d083ee4a6e6d962b73523cd3cbfee53..bf01db4a5fde06f0c745981de538050544f43c10 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 <http://www.gnu.org/licenses/>. -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 a06fdff5d4568e80c66b055af23aa18c9fbbe82d..8854576d9e6b83d4e8716f0a9e7a2fa48ff8f845 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 <http://www.gnu.org/licenses/>. -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 65c5e05877bd716de0c0d83150d26ece6df026e5..89feb1961f28fce46a1a36fbd9290e4647f1481c 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 094b88ecb240592ddce99a1556ee21382d08a763..67f1d5681fdd0fa29e32e6ab075d8b411d5ad109 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