Commit 2af294a5 authored by sebastien's avatar sebastien
Browse files

trunk: removed remnants of dr_algo option


git-svn-id: https://www.dynare.org/svn/dynare/dynare_v4@2118 ac1d8469-bf42-47a9-8791-bf33cf982152
parent 928fa74a
......@@ -39,7 +39,6 @@ global it_
options_ = set_default_option(options_,'noprint',0);
options_ = set_default_option(options_,'linear',0);
options_ = set_default_option(options_,'dr_algo',0);
options_ = set_default_option(options_,'steadystate_flag',0);
options_.order = 1;
if exist([M_.fname '_steadystate.m'])
......
......@@ -18,7 +18,6 @@ function [A,B,ys,info] = dynare_resolve(iv,ic,aux)
% info=3: Blanchard Kahn conditions are not satisfied: no stable '...' equilibrium
% info=4: Blanchard Kahn conditions are not satisfied:'...' indeterminacy
% info=5: Blanchard Kahn conditions are not satisfied:'...' indeterminacy due to rank failure
% info=11: same as dr1 for dr_algo = 2
% info=20: can't find steady state info(2) contains sum of sqare residuals
% info=30: variance can't be computed
%
......
......@@ -108,7 +108,6 @@ function global_initialization()
% Solution
options_.order = 2;
options_.dr_algo = 0;
options_.solve_algo = 2;
options_.linear = 0;
options_.replic = 50;
......
......@@ -23,7 +23,6 @@ function osr(var_list,params,i_var,W)
options_ = set_default_option(options_,'linear',0);
options_ = set_default_option(options_,'ar',5);
options_ = set_default_option(options_,'irf',40);
options_ = set_default_option(options_,'dr_algo',0);
options_ = set_default_option(options_,'simul_algo',0);
options_ = set_default_option(options_,'drop',100);
options_ = set_default_option(options_,'replic',1);
......
......@@ -41,10 +41,6 @@ function print_info(info)
options_ = set_default_option(options_,'noprint',0);
if ~options_.noprint
if info(1) > 10 & info(1) < 20
disp('Failure in dr_algo=2')
info(1) = info(1) - 10;
end
switch info(1)
case 1
error(['The model doesn''t determine the current variables' ...
......
......@@ -14,7 +14,6 @@ function [dr,info]=resol(ys,check_flag)
% info=3: Blanchard Kahn conditions are not satisfied: no stable '...' equilibrium
% info=4: Blanchard Kahn conditions are not satisfied:'...' indeterminacy
% info=5: Blanchard Kahn conditions are not satisfied:'...' indeterminacy due to rank failure
% info=11: same as dr1 for dr_algo = 2
% info=20: can't find steady state info(2) contains sum of sqare residuals
% info=30: Variance can't be computed
%
......@@ -40,12 +39,7 @@ function [dr,info]=resol(ys,check_flag)
global M_ options_ oo_ bayestopt_
global it_
% plus:
% 11 .... same as dr1 for dr_algo = 2
% 20: can't find steady state info(2) contains sum of sqare residuals
%unfinished
jacobian_flag = 0;
options_ = set_default_option(options_,'jacobian_flag',1);
......@@ -106,15 +100,6 @@ if info(1)
return
end
if options_.dr_algo == 1 & options_.order > 1
dr.ys = dynare_solve('dr2',ys,0,dr);
dr.fbias = 2*feval([M_.fname '_static'],dr.ys,oo_.exo_steady_state, M_.params);
[dr,info1,M_,options_,oo_] = dr1(dr,check_flag,M_,options_,oo_);
if info1(1)
info(1) = info(1)+10;
return
end
end
if M_.exo_det_nbr > 0
oo_.exo_det_simul = tempexdet;
end
......
......@@ -85,7 +85,7 @@ class ParsingDriver;
%token BVAR_PRIOR_MU BVAR_PRIOR_OMEGA BVAR_PRIOR_TAU BVAR_PRIOR_TRAIN
%token BVAR_REPLIC
%token CALIB CALIB_VAR CHECK CONF_SIG CONSTANT CORR COVAR CUTOFF
%token DATAFILE DR_ALGO DROP DSAMPLE DYNASAVE DYNATYPE
%token DATAFILE DROP DSAMPLE DYNASAVE DYNATYPE
%token END ENDVAL EQUAL ESTIMATION ESTIMATED_PARAMS ESTIMATED_PARAMS_BOUNDS ESTIMATED_PARAMS_INIT
%token FILENAME FILTER_STEP_AHEAD FILTERED_VARS FIRST_OBS
%token <string_val> FLOAT_NUMBER
......@@ -653,8 +653,7 @@ stoch_simul_options_list : stoch_simul_options_list COMMA stoch_simul_options
| stoch_simul_options
;
stoch_simul_options : o_dr_algo
| o_solve_algo
stoch_simul_options : o_solve_algo
| o_simul_algo
| o_linear
| o_order
......@@ -1299,7 +1298,6 @@ number : INT_NUMBER
| FLOAT_NUMBER
;
o_dr_algo : DR_ALGO EQUAL INT_NUMBER { driver.option_num("dr_algo", $3); };
o_solve_algo : SOLVE_ALGO EQUAL INT_NUMBER { driver.option_num("solve_algo", $3); };
o_simul_algo : SIMUL_ALGO EQUAL INT_NUMBER { driver.option_num("simul_algo", $3); };
o_linear : LINEAR { driver.linear(); };
......
......@@ -254,7 +254,6 @@ int sigma_e = 0;
/* Inside Dynare statement */
<DYNARE_STATEMENT>solve_algo {return token::SOLVE_ALGO;}
<DYNARE_STATEMENT>dr_algo {return token::DR_ALGO;}
<DYNARE_STATEMENT>simul_algo {return token::SIMUL_ALGO;}
<DYNARE_STATEMENT>drop {return token::DROP;}
<DYNARE_STATEMENT>order {return token::ORDER;}
......
Markdown is supported
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