From 5131f3907f1eebed0fc6e54364322cf86b040405 Mon Sep 17 00:00:00 2001 From: Johannes Pfeifer Date: Sat, 4 Apr 2015 19:22:49 +0200 Subject: [PATCH] Make sure the used global variables are correctly set and available in the base workspace --- matlab/global_initialization.m | 5 +++-- preprocessor/ModFile.cc | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/matlab/global_initialization.m b/matlab/global_initialization.m index f8e622a84..6869cc748 100644 --- a/matlab/global_initialization.m +++ b/matlab/global_initialization.m @@ -28,10 +28,11 @@ function global_initialization() % You should have received a copy of the GNU General Public License % along with Dynare. If not, see . -global oo_ M_ options_ estim_params_ bayestopt_ estimation_info ex0_ ys0_ - +global oo_ M_ options_ estim_params_ bayestopt_ estimation_info ex0_ ys0_ dataset_ dataset_info estim_params_ = []; bayestopt_ = []; +dataset_=[]; +dataset_info=[]; options_.datafile = ''; options_.dirname = M_.fname; M_.dname = M_.fname; diff --git a/preprocessor/ModFile.cc b/preprocessor/ModFile.cc index a4693cfc7..0977b6d9f 100644 --- a/preprocessor/ModFile.cc +++ b/preprocessor/ModFile.cc @@ -566,14 +566,14 @@ ModFile::writeOutputFiles(const string &basename, bool clear_all, bool clear_glo if (clear_all) mOutputFile << "clear all" << endl; else if (clear_global) - mOutputFile << "clear M_ options_ oo_ estim_params_ bayestopt_ dataset_;" << endl; + mOutputFile << "clear M_ options_ oo_ estim_params_ bayestopt_ dataset_ dataset_info estimation_info ys0_ ex0_;" << endl; mOutputFile << "tic;" << endl << "% Save empty dates and dseries objects in memory." << endl << "dates('initialize');" << endl << "dseries('initialize');" << endl << "% Define global variables." << endl - << "global M_ oo_ options_ ys0_ ex0_ estimation_info" << endl + << "global M_ options_ oo_ estim_params_ bayestopt_ dataset_ dataset_info estimation_info ys0_ ex0_" << endl << "options_ = [];" << endl << "M_.fname = '" << basename << "';" << endl << "M_.dynare_version = '" << PACKAGE_VERSION << "';" << endl