Correction of bugs related to the _steadystate file.

git-svn-id: https://www.dynare.org/svn/dynare/dynare_v4@822 ac1d8469-bf42-47a9-8791-bf33cf982152

matlab/check.m

@@ -15,6 +15,10 @@ global it_
   options_ = set_default_option(options_,'order',1);  
   options_ = set_default_option(options_,'linear',0);  
   options_ = set_default_option(options_,'dr_algo',0);  
+  options_ = set_default_option(options_,'steadystate_flag',0);
+  if exist([M_.fname '_steadystate.m'])
+    options_.steadystate_flag = 1;
+  end
 
   [dr, info] = resol(oo_.steady_state,1);
   

matlab/dynare_MC.m

@@ -57,6 +57,10 @@ options_ = set_default_option(options_,'posterior_mode_estimation',1);
 options_ = set_default_option(options_,'MaxNumberOfBytes',1e6);
 options_ = set_default_option(options_,'xls_sheet','');
 options_ = set_default_option(options_,'xls_range','');
+options_ = set_default_option(options_,'steadystate_flag',0);
+if exist([M_.fname '_steadystate.m'])
+  options_.steadystate_flag = 1;
+end
 
 %% Add something to the parser ++>
 M_.dname = M_.fname; % The user should be able to choose another name
@@ -109,13 +113,6 @@ ncn = estim_params_.ncn;
 np  = estim_params_.np ;
 nx  = nvx+nvn+ncx+ncn+np;
 
-%% Static solver
-if exist([M_.fname '_steadystate'])
-  bayestopt_.static_solve = [M_.fname '_steadystate'];
-else
-  bayestopt_.static_solve = 'dynare_solve';
-end
-
 dr = set_state_space([]);
 
 %% Initialization with unit-root variables

matlab/dynare_estimation.m

@@ -64,6 +64,10 @@ options_ = set_default_option(options_,'filter_step_ahead',0);
 options_ = set_default_option(options_,'diffuse_d',[]);
 options_ = set_default_option(options_,'Opt6Iter',3);
 options_ = set_default_option(options_,'Opt6Numb',100000);
+options_ = set_default_option(options_,'steadystate_flag',0);
+if exist([M_.fname '_steadystate.m'])
+  options_.steadystate_flag = 1;
+end
 
 if options_.filtered_vars ~= 0 & options_.filter_step_ahead == 0
   options_.filter_step_ahead = 1;
@@ -131,14 +135,6 @@ ncn = estim_params_.ncn;
 np  = estim_params_.np ;
 nx  = nvx+nvn+ncx+ncn+np;
 
-%% Static solver
-if exist([M_.fname '_steadystate'])
-  bayestopt_.static_solve = [M_.fname '_steadystate'];
-  eval(['[ys,check] = ' bayestopt_.static_solve '([],[]);'])
-else
-  bayestopt_.static_solve = 'dynare_solve';
-end
-
 dr = set_state_space([]);
 
 %% Initialization with unit-root variables
@@ -243,8 +239,8 @@ if length(options_.mode_file) > 0 & options_.posterior_mode_estimation
 end
 
 % Compute the steadyn state if the _steadystate.m file is provided
-if strcmpi(bayestopt_.static_solve,[M_.fname '_steadystate'])
-      [oo_.steady_state,tchek] = feval(bayestopt_.static_solve,[],[]);
+if options_.steadystate_flag
+  [oo_.steady_state,tchek] = feval([M_.fname '_steadystate'],[],[]);
 end
 initial_estimation_checks(xparam1,gend,data);
 

matlab/resol.m

@@ -33,8 +33,8 @@ dr.ys = ys;
 fh = str2func([M_.fname '_static']);
 if options_.linear == 0
   if max(abs(feval(fh,dr.ys,[oo_.exo_steady_state; oo_.exo_det_steady_state]))) > options_.dynatol & options_.olr == 0
-    if strcmpi(bayestopt_.static_solve,[M_.fname '_steadystate'])
-      [dr.ys,check1] = feval(bayestopt_.static_solve,dr.ys,...
+    if options_.steadystate_flag
+      [dr.ys,check1] = feval([M_.fname '_steadystate'],dr.ys,...
 			     [oo_.exo_steady_state; oo_.exo_det_steady_state]);
     else
       [dr.ys,check1] = dynare_solve(fh,dr.ys,options_.jacobian_flag,...

matlab/steady.m

@@ -5,6 +5,10 @@ function steady(linear)
   global M_ oo_ options_ ys0_ 
 
   options_ = set_default_option(options_,'jacobian_flag',1);
+  options_ = set_default_option(options_,'steadystate_flag',0);
+  if exist([M_.fname 'steadystate.m'])
+    options_.steadystate_flag = 1;
+  end 
     
   steady_;
   

matlab/steady_.m

@@ -4,7 +4,7 @@ function steady_()
 
   global M_ oo_ it_ options_
 
-  if exist([M_.fname '_steadystate'])
+  if options_.steadystate_flag
     [oo_.steady_state,check] = feval([M_.fname '_steadystate'],...
 				     oo_.steady_state,...
 				     [oo_.exo_steady_state; ...