From 0b8287426806190927df4f9bf77016cb7d1939b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Adjemian=20=28Scylla=29?=
<stephane.adjemian@univ-lemans.fr>
Date: Wed, 25 Jun 2014 11:34:39 +0200
Subject: [PATCH] Adapted madataset routine for Gsa.
---
matlab/dynare_estimation_init.m | 2 +-
matlab/utilities/dataset/makedataset.m | 9 +++++++--
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/matlab/dynare_estimation_init.m b/matlab/dynare_estimation_init.m
index 12b1cc60c5..874f964224 100644
--- a/matlab/dynare_estimation_init.m
+++ b/matlab/dynare_estimation_init.m
@@ -448,7 +448,7 @@ k = find(isnan(bayestopt_.jscale));
bayestopt_.jscale(k) = options_.mh_jscale;
% Build the dataset
-[dataset_, dataset_info] = makedataset(options_);
+[dataset_, dataset_info] = makedataset(options_, options_.dsge_var*options_.dsge_varlag, gsa_flag);
% setting steadystate_check_flag option
if options_.diffuse_filter
diff --git a/matlab/utilities/dataset/makedataset.m b/matlab/utilities/dataset/makedataset.m
index 6af59b0652..9eb4cb3968 100644
--- a/matlab/utilities/dataset/makedataset.m
+++ b/matlab/utilities/dataset/makedataset.m
@@ -1,4 +1,4 @@
-function [DynareDataset, DatasetInfo] = makedataset(DynareOptions,initialconditions)
+function [DynareDataset, DatasetInfo] = makedataset(DynareOptions, initialconditions, gsa_flag)
% Initialize a dataset as a dseries object.
%
@@ -23,7 +23,11 @@ function [DynareDataset, DatasetInfo] = makedataset(DynareOptions,initialconditi
%
% See also dynare_estimation_init
-if nargin<2
+if nargin<3
+ gsa_flag = 0;
+end
+
+if nargin<2 || isempty(initialconditions)
% If a the sample is to be used for the estimation of a VAR or DSGE-VAR model
% the second argument must be a strictly positive integer (the number of lags).
initialconditions = 0;
@@ -32,6 +36,7 @@ end
if isempty(DynareOptions.datafile) && isempty(DynareOptions.dataset.file) && isempty(DynareOptions.dataset.series)
if gsa_flag
DynareDataset = dseries();
+ DatasetInfo = [];
return
else
error('makedataset: datafile option is missing!')
--
GitLab