Commit 8373f0b9 authored by Sébastien Villemot's avatar Sébastien Villemot
Browse files

Merge remote-tracking branch 'ferhat/master'

parents 8a5dbb5e b824789d
......@@ -2290,6 +2290,13 @@ add new variables one by one.
@table @code
@item maxit = @var{INTEGER}
Determines the maximum number of iterations used in the non-linear solver.
The default value of @code{maxit} is 10. The @code{maxit} option is shared with the
@code{simul} command. So a change in @code{maxit} in a @code{steady} command will
also be considered in the following @code{simul} commands.
@item solve_algo = @var{INTEGER}
@anchor{solve_algo}
Determines the non-linear solver to use. Possible values for the option are:
......@@ -2341,6 +2348,7 @@ steady state. If you use this option, you must specify a
@code{homotopy_setup} block. This option can take three possible
values:
@table @code
@item 1
......@@ -2728,6 +2736,13 @@ for the number of periods set in the option @code{periods}.
@item periods = @var{INTEGER}
Number of periods of the simulation
@item maxit = @var{INTEGER}
Determines the maximum number of iterations used in the non-linear solver.
The default value of @code{maxit} is 10. The @code{maxit} option is shared with the
@code{steady} command. So a change in @code{maxit} in a @code{simul} command will
also be considered in the following @code{steady} commands.
@item stack_solve_algo = @var{INTEGER}
Algorithm used for computing the solution. Possible values are:
......
......@@ -106,7 +106,7 @@ class ParsingDriver;
%token INV_GAMMA_PDF INV_GAMMA1_PDF INV_GAMMA2_PDF IRF IRF_SHOCKS
%token KALMAN_ALGO KALMAN_TOL
%token LABELS LAPLACE LIK_ALGO LIK_INIT LINEAR LOAD_IDENT_FILES LOAD_MH_FILE LOAD_PARAMS_AND_STEADY_STATE LOGLINEAR
%token MARKOWITZ MARGINAL_DENSITY MAX
%token MARKOWITZ MARGINAL_DENSITY MAX MAXIT
%token MFS MH_DROP MH_INIT_SCALE MH_JSCALE MH_MODE MH_NBLOCKS MH_REPLIC MH_RECOVER MIN MINIMAL_SOLVING_PERIODS
%token MODE_CHECK MODE_COMPUTE MODE_FILE MODEL MODEL_COMPARISON MODEL_INFO MSHOCKS ABS SIGN
%token MODIFIEDHARMONICMEAN MOMENTS_VARENDO DIFFUSE_FILTER
......@@ -804,6 +804,7 @@ steady_options : o_solve_algo
| o_homotopy_mode
| o_homotopy_steps
| o_markowitz
| o_maxit
;
check : CHECK ';'
......@@ -837,6 +838,7 @@ simul_options : o_periods
| o_stack_solve_algo
| o_markowitz
| o_minimal_solving_periods
| o_maxit
;
external_function : EXTERNAL_FUNCTION '(' external_function_options_list ')' ';'
......@@ -1828,7 +1830,8 @@ o_irf_shocks : IRF_SHOCKS EQUAL '(' symbol_list ')' { driver.option_symbol_list(
o_hp_filter : HP_FILTER EQUAL non_negative_number { driver.option_num("hp_filter", $3); };
o_hp_ngrid : HP_NGRID EQUAL INT_NUMBER { driver.option_num("hp_ngrid", $3); };
o_periods : PERIODS EQUAL INT_NUMBER { driver.option_num("periods", $3); };
o_cutoff : CUTOFF EQUAL non_negative_number { driver.cutoff($3); }
o_maxit : MAXIT EQUAL INT_NUMBER { driver.option_num("maxit_", $3); };
o_cutoff : CUTOFF EQUAL non_negative_number { driver.cutoff($3); };
o_markowitz : MARKOWITZ EQUAL non_negative_number { driver.option_num("markowitz", $3); };
o_minimal_solving_periods : MINIMAL_SOLVING_PERIODS EQUAL non_negative_number { driver.option_num("minimal_solving_periods", $3); };
o_mfs : MFS EQUAL INT_NUMBER { driver.mfs($3); };
......
......@@ -353,6 +353,7 @@ string eofbuff;
<DYNARE_STATEMENT>max_iterations_increment_value {return token::MAX_ITERATIONS_INCREMENT_VALUE;}
<DYNARE_STATEMENT>max_block_iterations {return token::MAX_BLOCK_ITERATIONS;}
<DYNARE_STATEMENT>max_repeated_optimization_runs {return token::MAX_REPEATED_OPTIMIZATION_RUNS;}
<DYNARE_STATEMENT>maxit {return token::MAXIT;}
<DYNARE_STATEMENT>function_convergence_criterion {return token::FUNCTION_CONVERGENCE_CRITERION;}
<DYNARE_STATEMENT>parameter_convergence_criterion {return token::PARAMETER_CONVERGENCE_CRITERION;}
<DYNARE_STATEMENT>number_of_large_perturbations {return token::NUMBER_OF_LARGE_PERTURBATIONS;}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment