From 508f2ff01e07b5fa770ebcf8969f9a3bb4f6e752 Mon Sep 17 00:00:00 2001 From: Johannes Pfeifer Date: Wed, 5 Jul 2023 13:40:06 -0400 Subject: [PATCH] Add interface for brooks_gelman_plotrows option --- src/DynareBison.yy | 4 +++- src/DynareFlex.ll | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/DynareBison.yy b/src/DynareBison.yy index bafbc2a9..06ce4ebd 100644 --- a/src/DynareBison.yy +++ b/src/DynareBison.yy @@ -101,7 +101,7 @@ class ParsingDriver; %token MFS MH_CONF_SIG MH_DROP MH_INIT_SCALE MH_INIT_SCALE_FACTOR MH_JSCALE MH_TUNE_JSCALE MH_TUNE_GUESS MH_POSTERIOR_MODE_ESTIMATION MH_NBLOCKS MH_REPLIC MH_RECOVER MH_INITIALIZE_FROM_PREVIOUS_MCMC MH_INITIALIZE_FROM_PREVIOUS_MCMC_DIRECTORY MH_INITIALIZE_FROM_PREVIOUS_MCMC_RECORD MH_INITIALIZE_FROM_PREVIOUS_MCMC_PRIOR %token POSTERIOR_MAX_SUBSAMPLE_DRAWS MIN MINIMAL_SOLVING_PERIODS %token MODE_CHECK MODE_CHECK_NEIGHBOURHOOD_SIZE MODE_CHECK_SYMMETRIC_PLOTS MODE_CHECK_NUMBER_OF_POINTS MODE_COMPUTE MODE_FILE MODEL MODEL_COMPARISON MODEL_INFO MSHOCKS ABS SIGN -%token MODEL_DIAGNOSTICS MODIFIEDHARMONICMEAN MOMENTS_VARENDO CONTEMPORANEOUS_CORRELATION DIFFUSE_FILTER SUB_DRAWS TAPER_STEPS GEWEKE_INTERVAL RAFTERY_LEWIS_QRS RAFTERY_LEWIS_DIAGNOSTICS MCMC_JUMPING_COVARIANCE MOMENT_CALIBRATION +%token MODEL_DIAGNOSTICS MODIFIEDHARMONICMEAN MOMENTS_VARENDO CONTEMPORANEOUS_CORRELATION DIFFUSE_FILTER SUB_DRAWS TAPER_STEPS GEWEKE_INTERVAL RAFTERY_LEWIS_QRS RAFTERY_LEWIS_DIAGNOSTICS BROOKS_GELMAN_PLOTROWS MCMC_JUMPING_COVARIANCE MOMENT_CALIBRATION %token NUMBER_OF_PARTICLES RESAMPLING SYSTEMATIC GENERIC RESAMPLING_THRESHOLD RESAMPLING_METHOD KITAGAWA STRATIFIED SMOOTH %token CPF_WEIGHTS AMISANOTRISTANI MURRAYJONESPARSLOW WRITE_EQUATION_TAGS FILTER_INITIAL_STATE %token NONLINEAR_FILTER_INITIALIZATION FILTER_ALGORITHM PROPOSAL_APPROXIMATION CUBATURE UNSCENTED MONTECARLO DISTRIBUTION_APPROXIMATION @@ -2209,6 +2209,7 @@ estimation_options : o_datafile | o_geweke_interval | o_raftery_lewis_qrs | o_raftery_lewis_diagnostics + | o_brooks_gelman_plotrows | o_mcmc_jumping_covariance | o_irf_plot_threshold | o_posterior_max_subsample_draws @@ -3697,6 +3698,7 @@ o_taper_steps : TAPER_STEPS EQUAL vec_int { driver.option_vec_int("convergence.g o_geweke_interval : GEWEKE_INTERVAL EQUAL vec_value { driver.option_vec_value("convergence.geweke.geweke_interval",$3); }; o_raftery_lewis_diagnostics : RAFTERY_LEWIS_DIAGNOSTICS { driver.option_num("convergence.rafterylewis.indicator", "true"); }; o_raftery_lewis_qrs : RAFTERY_LEWIS_QRS EQUAL vec_value { driver.option_vec_value("convergence.rafterylewis.qrs",$3); }; +o_brooks_gelman_plotrows: BROOKS_GELMAN_PLOTROWS EQUAL INT_NUMBER { driver.option_num("convergence.brooksgelman.plotrows", $3); }; o_constant : CONSTANT { driver.option_num("noconstant", "false"); }; o_noconstant : NOCONSTANT { driver.option_num("noconstant", "true"); }; o_mh_recover : MH_RECOVER { driver.option_num("mh_recover", "true"); }; diff --git a/src/DynareFlex.ll b/src/DynareFlex.ll index fbc04cd2..dfdf1ec1 100644 --- a/src/DynareFlex.ll +++ b/src/DynareFlex.ll @@ -299,6 +299,7 @@ DATE -?[0-9]+([ya]|m([1-9]|1[0-2])|q[1-4]) geweke_interval {return token::GEWEKE_INTERVAL;} raftery_lewis_qrs {return token::RAFTERY_LEWIS_QRS;} raftery_lewis_diagnostics {return token::RAFTERY_LEWIS_DIAGNOSTICS;} +brooks_gelman_plotrows {return token::BROOKS_GELMAN_PLOTROWS;} graph {return token::GRAPH;} nograph {return token::NOGRAPH;} posterior_graph {return token::POSTERIOR_GRAPH;}