From ed549d3ba7657c8a6e6e5afaad7288464a9da19f Mon Sep 17 00:00:00 2001 From: Houtan Bastani Date: Thu, 21 Jul 2016 09:39:49 -0400 Subject: [PATCH] preprocessor: add tolx to perfect_foresight_solver --- preprocessor/DynareBison.yy | 4 +++- preprocessor/DynareFlex.ll | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/preprocessor/DynareBison.yy b/preprocessor/DynareBison.yy index 09214d642..e7d8ed5b5 100644 --- a/preprocessor/DynareBison.yy +++ b/preprocessor/DynareBison.yy @@ -103,7 +103,7 @@ class ParsingDriver; %token IDENTIFICATION INF_CONSTANT INITVAL INITVAL_FILE BOUNDS JSCALE INIT INFILE INVARS %token INT_NUMBER %token INV_GAMMA_PDF INV_GAMMA1_PDF INV_GAMMA2_PDF IRF IRF_SHOCKS IRF_PLOT_THRESHOLD IRF_CALIBRATION -%token FAST_KALMAN_FILTER KALMAN_ALGO KALMAN_TOL DIFFUSE_KALMAN_TOL SUBSAMPLES OPTIONS TOLF +%token FAST_KALMAN_FILTER KALMAN_ALGO KALMAN_TOL DIFFUSE_KALMAN_TOL SUBSAMPLES OPTIONS TOLF TOLX %token LAPLACE LIK_ALGO LIK_INIT LINEAR LOAD_IDENT_FILES LOAD_MH_FILE LOAD_PARAMS_AND_STEADY_STATE LOGLINEAR LOGDATA LYAPUNOV LINEAR_APPROXIMATION %token LYAPUNOV_FIXED_POINT_TOL LYAPUNOV_DOUBLING_TOL LYAPUNOV_SQUARE_ROOT_SOLVER_TOL LOG_DEFLATOR LOG_TREND_VAR LOG_GROWTH_FACTOR MARKOWITZ MARGINAL_DENSITY MAX MAXIT %token MFS MH_CONF_SIG MH_DROP MH_INIT_SCALE MH_JSCALE MH_MODE MH_NBLOCKS MH_REPLIC MH_RECOVER POSTERIOR_MAX_SUBSAMPLE_DRAWS MIN MINIMAL_SOLVING_PERIODS @@ -1064,6 +1064,7 @@ perfect_foresight_solver_options : o_stack_solve_algo | o_lmmcp | o_occbin | o_pf_tolf + | o_pf_tolx ; prior_function : PRIOR_FUNCTION '(' prior_posterior_function_options_list ')' ';' @@ -2737,6 +2738,7 @@ o_dp_maxit : MAXIT EQUAL INT_NUMBER { driver.option_num("dp.maxit", $3); }; o_osr_maxit : MAXIT EQUAL INT_NUMBER { driver.option_num("osr.maxit", $3); }; o_osr_tolf : TOLF EQUAL non_negative_number { driver.option_num("osr.tolf", $3); }; o_pf_tolf : TOLF EQUAL non_negative_number { driver.option_num("dynatol.f", $3); }; +o_pf_tolx : TOLX EQUAL non_negative_number { driver.option_num("dynatol.x", $3); }; o_steady_tolf : TOLF EQUAL non_negative_number { driver.option_num("solve_tolf", $3); }; o_opt_algo : OPT_ALGO EQUAL INT_NUMBER { driver.option_num("osr.opt_algo", $3); } | OPT_ALGO EQUAL filename { driver.option_str("osr.opt_algo", $3); } diff --git a/preprocessor/DynareFlex.ll b/preprocessor/DynareFlex.ll index f2efc72ff..2678b7e7a 100644 --- a/preprocessor/DynareFlex.ll +++ b/preprocessor/DynareFlex.ll @@ -523,6 +523,7 @@ DATE -?[0-9]+([YyAa]|[Mm]([1-9]|1[0-2])|[Qq][1-4]|[Ww]([1-9]{1}|[1-4][0-9]|5[0-2 random_function_convergence_criterion {return token::RANDOM_FUNCTION_CONVERGENCE_CRITERION;} random_parameter_convergence_criterion {return token::RANDOM_PARAMETER_CONVERGENCE_CRITERION;} tolf {return token::TOLF;} +tolx {return token::TOLX;} opt_algo {return token::OPT_ALGO;} instruments {return token::INSTRUMENTS;} hessian {