From 338fb396386fcb16eebf132d63833c6862d18d5f Mon Sep 17 00:00:00 2001 From: michel Date: Mon, 30 Nov 2009 19:54:45 +0000 Subject: [PATCH] 4.1: add preprocessor interface for k_order_solver rename use_k_order to k_order_solver in Matlab procedures fix tests git-svn-id: https://www.dynare.org/svn/dynare/trunk@3179 ac1d8469-bf42-47a9-8791-bf33cf982152 --- DynareBison.yy | 4 +++- DynareFlex.ll | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/DynareBison.yy b/DynareBison.yy index 678e3ce4..6d1727f1 100644 --- a/DynareBison.yy +++ b/DynareBison.yy @@ -97,7 +97,7 @@ class ParsingDriver; %token END ENDVAL EQUAL ESTIMATION ESTIMATED_PARAMS ESTIMATED_PARAMS_BOUNDS ESTIMATED_PARAMS_INIT %token FILENAME FILTER_STEP_AHEAD FILTERED_VARS FIRST_OBS %token FLOAT_NUMBER -%token FORECAST +%token FORECAST K_ORDER_SOLVER %token GAMMA_PDF GRAPH CONDITIONAL_VARIANCE_DECOMPOSITION %token HISTVAL HOMOTOPY_SETUP HOMOTOPY_MODE HOMOTOPY_STEPS HP_FILTER HP_NGRID %token IDENTIFICATION INF_CONSTANT INITVAL INITVAL_FILE @@ -804,6 +804,7 @@ stoch_simul_options : o_dr_algo | o_aim_solver | o_partial_information | o_conditional_variance_decomposition + | o_k_order_solver ; symbol_list : symbol_list symbol @@ -1858,6 +1859,7 @@ o_draws_nbr_burn_in_2 : DRAWS_NBR_BURN_IN_2 EQUAL INT_NUMBER {driver.option_num( o_draws_nbr_mean_var_estimate : DRAWS_NBR_MEAN_VAR_ESTIMATE EQUAL INT_NUMBER {driver.option_num("ms.draws_nbr_mean_var_estimate",$3); }; o_draws_nbr_modified_harmonic_mean : DRAWS_NBR_MODIFIED_HARMONIC_MEAN EQUAL INT_NUMBER {driver.option_num("ms.draws_nbr_modified_harmonic_mean",$3); }; o_dirichlet_scale : DIRICHLET_SCALE EQUAL INT_NUMBER {driver.option_num("ms.dirichlet_scale",$3); }; +o_k_order_solver : K_ORDER_SOLVER {driver.option_num("k_order_solver","1"); }; o_chain : CHAIN EQUAL INT_NUMBER { ;}; o_state : STATE EQUAL INT_NUMBER { ;}; diff --git a/DynareFlex.ll b/DynareFlex.ll index ba0560ee..28d2d67c 100644 --- a/DynareFlex.ll +++ b/DynareFlex.ll @@ -343,6 +343,7 @@ int sigma_e = 0; posterior_mode {return token::POSTERIOR_MODE; } posterior_mean {return token::POSTERIOR_MEAN; } posterior_median {return token::POSTERIOR_MEDIAN; } +k_order_solver {return token::K_ORDER_SOLVER; } [\$][^$]*[\$] {