From 15bd6dd04a8213f916a2cb1ac9c820ce716b18a0 Mon Sep 17 00:00:00 2001 From: Johannes Pfeifer Date: Tue, 20 Dec 2016 13:57:27 +0100 Subject: [PATCH 1/2] Finish implementation and documentation of nograph option of shock_decomposition.m --- DynareBison.yy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DynareBison.yy b/DynareBison.yy index b1189551..03e4b844 100644 --- a/DynareBison.yy +++ b/DynareBison.yy @@ -2816,7 +2816,7 @@ o_nograph : NOGRAPH | GRAPH { driver.option_num("nograph", "0"); } ; -o_shock_decomposition_nograph : NOGRAPH { driver.option_num("shock_decomp.nograph", "1"); } +o_shock_decomposition_nograph : NOGRAPH { driver.option_num("no_graph.shock_decomposition", "1"); } o_nodisplay : NODISPLAY { driver.option_num("nodisplay","1"); }; o_graph_format : GRAPH_FORMAT EQUAL allowed_graph_formats { driver.process_graph_format_option(); } From 2a442561c679fe63d9f97270c76f0b064f85686a Mon Sep 17 00:00:00 2001 From: Johannes Pfeifer Date: Mon, 26 Dec 2016 13:07:46 +0100 Subject: [PATCH 2/2] Implement preprocessor interface for posterior_nograph option --- DynareBison.yy | 8 +++++++- DynareFlex.ll | 2 ++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/DynareBison.yy b/DynareBison.yy index 03e4b844..d84d7790 100644 --- a/DynareBison.yy +++ b/DynareBison.yy @@ -114,7 +114,7 @@ class ParsingDriver; %token FILTER_ALGORITHM PROPOSAL_APPROXIMATION CUBATURE UNSCENTED MONTECARLO DISTRIBUTION_APPROXIMATION %token NAME %token NAN_CONSTANT NO_STATIC NOBS NOCONSTANT NODISPLAY NOCORR NODIAGNOSTIC NOFUNCTIONS NO_HOMOTOPY -%token NOGRAPH NOMOMENTS NOPRINT NORMAL_PDF SAVE_DRAWS +%token NOGRAPH POSTERIOR_NOGRAPH POSTERIOR_GRAPH NOMOMENTS NOPRINT NORMAL_PDF SAVE_DRAWS %token OBSERVATION_TRENDS OPTIM OPTIM_WEIGHTS ORDER OSR OSR_PARAMS MAX_DIM_COVA_GROUP ADVANCED OUTFILE OUTVARS OVERWRITE %token PARALLEL_LOCAL_FILES PARAMETERS PARAMETER_SET PARTIAL_INFORMATION PERIODS PERIOD PLANNER_OBJECTIVE PLOT_CONDITIONAL_FORECAST PLOT_PRIORS PREFILTER PRESAMPLE %token PERFECT_FORESIGHT_SETUP PERFECT_FORESIGHT_SOLVER NO_POSTERIOR_KERNEL_DENSITY FUNCTION @@ -1726,6 +1726,7 @@ estimation_options : o_datafile | o_lik_algo | o_lik_init | o_nograph + | o_posterior_nograph | o_nodisplay | o_graph_format | o_forecasts_conf_sig @@ -2816,6 +2817,11 @@ o_nograph : NOGRAPH | GRAPH { driver.option_num("nograph", "0"); } ; +o_posterior_nograph : POSTERIOR_NOGRAPH + { driver.option_num("no_graph.posterior","1"); } + | POSTERIOR_GRAPH + { driver.option_num("no_graph.posterior", "0"); } + ; o_shock_decomposition_nograph : NOGRAPH { driver.option_num("no_graph.shock_decomposition", "1"); } o_nodisplay : NODISPLAY { driver.option_num("nodisplay","1"); }; o_graph_format : GRAPH_FORMAT EQUAL allowed_graph_formats diff --git a/DynareFlex.ll b/DynareFlex.ll index e461cb82..8d00b287 100644 --- a/DynareFlex.ll +++ b/DynareFlex.ll @@ -276,6 +276,8 @@ DATE -?[0-9]+([YyAa]|[Mm]([1-9]|1[0-2])|[Qq][1-4]|[Ww]([1-9]{1}|[1-4][0-9]|5[0-2 raftery_lewis_diagnostics {return token::RAFTERY_LEWIS_DIAGNOSTICS;} graph {return token::GRAPH;} nograph {return token::NOGRAPH;} +posterior_graph {return token::POSTERIOR_GRAPH;} +posterior_nograph {return token::POSTERIOR_NOGRAPH;} nodisplay {return token::NODISPLAY;} graph_format {return token::GRAPH_FORMAT;} eps {yylval->string_val = new string(yytext); return token::EPS;}