From c339ba94d66a57df78b366e8ddef97c923f59fb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Adjemian=20=28Charybdis=29?=
<stephane.adjemian@univ-lemans.fr>
Date: Thu, 28 Mar 2013 16:45:03 +0100
Subject: [PATCH] Recycle options_.dataset. If not empty (default) dataset
field has to be a dynSeries object.
---
matlab/dynare_estimation_init.m | 6 ++----
matlab/global_initialization.m | 11 ++++++-----
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/matlab/dynare_estimation_init.m b/matlab/dynare_estimation_init.m
index 4057c336c7..af476b32db 100644
--- a/matlab/dynare_estimation_init.m
+++ b/matlab/dynare_estimation_init.m
@@ -319,12 +319,10 @@ if options_.analytic_derivation,
end
end
-% Test if the data file is declared.
-if isempty(options_.datafile)
+% Test if the dataset is declared.
+if isempty(options_.datafile) && isempty(options_.dataset)
if gsa_flag
dataset_ = [];
-% rawdata = [];
-% data_info = [];
return
else
error('datafile option is missing')
diff --git a/matlab/global_initialization.m b/matlab/global_initialization.m
index 50cf7dd86e..a10ea6e702 100644
--- a/matlab/global_initialization.m
+++ b/matlab/global_initialization.m
@@ -33,6 +33,7 @@ global oo_ M_ options_ estim_params_ bayestopt_ estimation_info ex0_ ys0_ ex_de
estim_params_ = [];
bayestopt_ = [];
options_.datafile = '';
+options_.dataset = [];
options_.verbosity = 1;
options_.terminal_condition = 0;
options_.rplottype = 0;
@@ -329,11 +330,11 @@ estimation_info.structural_innovation_corr_prior_index = {};
estimation_info.structural_innovation_corr_options_index = {};
estimation_info.structural_innovation_corr.range_index = {};
options_.initial_period = dynDate(1);
-options_.dataset.firstobs = options_.initial_period;
-options_.dataset.lastobs = NaN;
-options_.dataset.nobs = NaN;
-options_.dataset.xls_sheet = NaN;
-options_.dataset.xls_range = NaN;
+options_.old_dataset.firstobs = options_.initial_period;
+options_.old_dataset.lastobs = NaN;
+options_.old_dataset.nobs = NaN;
+options_.old_dataset.xls_sheet = NaN;
+options_.old_dataset.xls_range = NaN;
options_.Harvey_scale_factor = 10;
options_.MaxNumberOfBytes = 1e6;
options_.MaximumNumberOfMegaBytes = 111;
--
GitLab