From 043aa109ea1878d13c90d17ec7d7c73f5326718c Mon Sep 17 00:00:00 2001
From: Houtan Bastani <houtan.bastani@ens.fr>
Date: Mon, 23 May 2011 11:20:24 +0200
Subject: [PATCH] preprocessor: added dynare_sensitivity option (cherry picked
from commit 2cc8e061e6ec14fdaa850ca8ff728f6e1e76ad6a)
Conflicts:
doc/dynare.texi
preprocessor/DynareBison.yy
---
matlab/dynare_sensitivity.m | 1 +
preprocessor/DynareBison.yy | 4 +++-
preprocessor/DynareFlex.ll | 1 +
3 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/matlab/dynare_sensitivity.m b/matlab/dynare_sensitivity.m
index 3f0227b21..389ca31cf 100644
--- a/matlab/dynare_sensitivity.m
+++ b/matlab/dynare_sensitivity.m
@@ -97,6 +97,7 @@ options_gsa = set_default_option(options_gsa,'redform',0);
options_gsa = set_default_option(options_gsa,'pprior',1);
options_gsa = set_default_option(options_gsa,'prior_range',1);
options_gsa = set_default_option(options_gsa,'ppost',0);
+options_gsa = set_default_option(options_gsa,'neighborhood_width',0);
options_gsa = set_default_option(options_gsa,'ilptau',1);
options_gsa = set_default_option(options_gsa,'morris',0);
options_gsa = set_default_option(options_gsa,'glue',0);
diff --git a/preprocessor/DynareBison.yy b/preprocessor/DynareBison.yy
index 3b454ee28..eb1b5ad50 100644
--- a/preprocessor/DynareBison.yy
+++ b/preprocessor/DynareBison.yy
@@ -159,7 +159,7 @@ class ParsingDriver;
%token MARKOV_SWITCHING CHAIN STATE DURATION NUMBER_OF_STATES
%token SVAR COEFFICIENTS VARIANCES CONSTANTS EQUATIONS
%token EXTERNAL_FUNCTION EXT_FUNC_NAME EXT_FUNC_NARGS FIRST_DERIV_PROVIDED SECOND_DERIV_PROVIDED
-%token SELECTED_VARIABLES_ONLY COVA_COMPUTE
+%token SELECTED_VARIABLES_ONLY COVA_COMPUTE NEIGHBORHOOD_WIDTH
%type <node_val> expression expression_or_empty
%type <node_val> equation hand_side
@@ -1537,6 +1537,7 @@ dynare_sensitivity_option : o_gsa_identification
| o_gsa_namexo
| o_gsa_namlagendo
| o_gsa_var_rmse
+ | o_gsa_neighborhood_width
| o_datafile
| o_nobs
| o_first_obs
@@ -1774,6 +1775,7 @@ o_gsa_istart_rmse : ISTART_RMSE EQUAL INT_NUMBER { driver.option_num("istart_rms
o_gsa_alpha_rmse : ALPHA_RMSE EQUAL non_negative_number { driver.option_num("alpha_rmse", $3); };
o_gsa_alpha2_rmse : ALPHA2_RMSE EQUAL non_negative_number { driver.option_num("alpha2_rmse", $3); };
o_gsa_trans_ident : TRANS_IDENT EQUAL INT_NUMBER { driver.option_num("trans_ident", $3); };
+o_gsa_neighborhood_width : NEIGHBORHOOD_WIDTH EQUAL non_negative_number { driver.option_num("neighborhood_width", $3); };
o_load_ident_files : LOAD_IDENT_FILES EQUAL INT_NUMBER { driver.option_num("load_ident_files", $3); }
o_useautocorr : USEAUTOCORR EQUAL INT_NUMBER { driver.option_num("useautocorr", $3); }
diff --git a/preprocessor/DynareFlex.ll b/preprocessor/DynareFlex.ll
index d39c04dfc..e184a3666 100644
--- a/preprocessor/DynareFlex.ll
+++ b/preprocessor/DynareFlex.ll
@@ -522,6 +522,7 @@ string eofbuff;
<DYNARE_STATEMENT>trans_ident {return token::TRANS_IDENT;}
<DYNARE_STATEMENT>load_ident_files {return token::LOAD_IDENT_FILES;}
<DYNARE_STATEMENT>useautocorr {return token::USEAUTOCORR;}
+<DYNARE_STATEMENT>neighborhood_width {return token::NEIGHBORHOOD_WIDTH;}
/* end of GSA options */
/* For identification() statement */
--
GitLab