diff --git a/matlab/global_initialization.m b/matlab/global_initialization.m index ef312e8f8a61c6907328ec941ad4c2d6d589b61e..e351845cee610ef5d738dddadeb22bee6165663b 100644 --- a/matlab/global_initialization.m +++ b/matlab/global_initialization.m @@ -370,6 +370,7 @@ options_.mh_autocorrelation_function_size = 30; options_.plot_priors = 1; options_.cova_compute = 1; options_.parallel = 0; +options_.parallel_info.isHybridMatlabOctave = false; options_.parallel_info.leaveSlaveOpen = 0; options_.parallel_info.RemoteTmpFolder = ''; options_.number_of_grid_points_for_kde = 2^9; diff --git a/matlab/parallel/InitializeComputationalEnvironment.m b/matlab/parallel/InitializeComputationalEnvironment.m index 151869fad3a27ccd43fd479d885bb1468b3d9c6f..529ef60bad4e5be1a0782c8f6c28f9491caebe66 100644 --- a/matlab/parallel/InitializeComputationalEnvironment.m +++ b/matlab/parallel/InitializeComputationalEnvironment.m @@ -45,6 +45,7 @@ end global options_ +isHybridMatlabOctave = false; for j=1:length(options_.parallel), if isempty(options_.parallel(j).MatlabOctavePath), if exist('OCTAVE_VERSION') @@ -57,8 +58,14 @@ for j=1:length(options_.parallel), dynareroot = strrep(which('dynare'),'dynare.m',''); options_.parallel(j).DynarePath=dynareroot; end + isHybridMatlabOctave = isHybridMatlabOctave || any(regexpi([options_.parallel(j).MatlabOctavePath], 'octave')); +end +isHybridMatlabOctave = isHybridMatlabOctave && ~exist('OCTAVE_VERSION'); +options_.parallel_info.isHybridMatlabOctave = isHybridMatlabOctave; +if isHybridMatlabOctave, + % Reset dynare random generator and seed. + set_dynare_seed('default'); end - diff --git a/matlab/set_dynare_seed.m b/matlab/set_dynare_seed.m index 944d11e509c357b62c2daf3411f43b25efdd6d91..0ebf223aa12cac250f72ad292d045ea48845891f 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 = ~(exist('OCTAVE_VERSION') || matlab_ver_less_than('7.7')); +matlab_random_streams = ~(exist('OCTAVE_VERSION') || matlab_ver_less_than('7.7') || options_.parallel_info.isHybridMatlabOctave); if matlab_random_streams% Use new matlab interface. if nargin==1