adding options LMMCP and OCCBIN to perfect_foresight_solver and

extended_path
issue#70
Michel Juillard 2015-06-02 17:38:04 +02:00
parent dae14ac19e
commit f914837aff
2 changed files with 9 additions and 1 deletions

View File

@ -127,7 +127,7 @@ class ParsingDriver;
%token UNIFORM_PDF UNIT_ROOT_VARS USE_DLL USEAUTOCORR GSA_SAMPLE_FILE USE_UNIVARIATE_FILTERS_IF_SINGULARITY_IS_DETECTED
%token VALUES VAR VAREXO VAREXO_DET VAROBS PREDETERMINED_VARIABLES
%token WRITE_LATEX_DYNAMIC_MODEL WRITE_LATEX_STATIC_MODEL WRITE_LATEX_ORIGINAL_MODEL
%token XLS_SHEET XLS_RANGE LONG_NAME
%token XLS_SHEET XLS_RANGE LONG_NAME LMMCP OCCBIN
%left COMMA
%left EQUAL_EQUAL EXCLAMATION_EQUAL
%left LESS GREATER LESS_EQUAL GREATER_EQUAL
@ -1012,6 +1012,8 @@ perfect_foresight_solver_options : o_stack_solve_algo
| o_simul_maxit
| o_endogenous_terminal_period
| o_no_homotopy
| o_lmmcp
| o_occbin
;
simul : SIMUL ';'
@ -2453,6 +2455,8 @@ extended_path_option : o_periods
| o_solver_periods
| o_extended_path_order
| o_hybrid
| o_lmmcp
| o_occbin
;
model_diagnostics : MODEL_DIAGNOSTICS ';'
@ -3020,6 +3024,8 @@ o_invars : INVARS EQUAL '(' symbol_list ')' { driver.option_symbol_list("invars"
o_period : PERIOD EQUAL INT_NUMBER { driver.option_num("period", $3); };
o_outfile : OUTFILE EQUAL filename { driver.option_str("outfile", $3); };
o_outvars : OUTVARS EQUAL '(' symbol_list ')' { driver.option_symbol_list("outvars"); };
o_lmmcp : LMMCP {driver.option_num("lmmcp", "1"); };
o_occbin : OCCBIN {driver.option_num("occbin", "1"); };
range : symbol ':' symbol
{

View File

@ -576,6 +576,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
<DYNARE_STATEMENT>tarb_mode_compute {return token::TARB_MODE_COMPUTE;}
<DYNARE_STATEMENT>tarb_new_block_probability {return token::TARB_NEW_BLOCK_PROBABILITY;}
<DYNARE_STATEMENT>tarb_optim {return token::TARB_OPTIM;}
<DYNARE_STATEMENT>lmmcp {return token::LMMCP;}
<DYNARE_STATEMENT>occbin {return token::OCCBIN;}
<DYNARE_STATEMENT>[\$][^$]*[\$] {
strtok(yytext+1, "$");