Skip to content
Snippets Groups Projects
Commit beade4be authored by ferhat's avatar ferhat
Browse files

References to model_mod option are ruled out of M-files

git-svn-id: https://www.dynare.org/svn/dynare/trunk@2878 ac1d8469-bf42-47a9-8791-bf33cf982152
parent 1786ba13
No related branches found
No related tags found
No related merge requests found
...@@ -49,11 +49,7 @@ global M_ options_ oo_ ...@@ -49,11 +49,7 @@ global M_ options_ oo_
oo_.exo_simul = tempex; oo_.exo_simul = tempex;
eigenvalues_ = dr.eigval; eigenvalues_ = dr.eigval;
if(options_.model_mode == 1)
nyf = dr.nyf;
else
nyf = nnz(dr.kstate(:,2)>M_.maximum_endo_lag+1); nyf = nnz(dr.kstate(:,2)>M_.maximum_endo_lag+1);
end;
[m_lambda,i]=sort(abs(eigenvalues_)); [m_lambda,i]=sort(abs(eigenvalues_));
n_explod = nnz(abs(eigenvalues_) > options_.qz_criterium); n_explod = nnz(abs(eigenvalues_) > options_.qz_criterium);
......
...@@ -113,7 +113,6 @@ function global_initialization() ...@@ -113,7 +113,6 @@ function global_initialization()
options_.replic = 50; options_.replic = 50;
options_.drop = 100; options_.drop = 100;
options_.simul_algo = 0; options_.simul_algo = 0;
options_.model_mode = 0;
% if mjdgges.dll (or .mexw32 or ....) doesn't exist, matlab/qz is added to the path. % if mjdgges.dll (or .mexw32 or ....) doesn't exist, matlab/qz is added to the path.
% There exists now qz/mjdgges.m that contains the calls to the old Sims code % There exists now qz/mjdgges.m that contains the calls to the old Sims code
% Hence, if mjdgges.m is visible exist(...)==2, % Hence, if mjdgges.m is visible exist(...)==2,
......
...@@ -67,7 +67,7 @@ function model_info; ...@@ -67,7 +67,7 @@ function model_info;
fprintf('\n\n'); fprintf('\n\n');
end; end;
else else
fprintf('There is no block decomposition of the model.\nUse ''sparse'' or ''sparse_dll'' model''s option.\n'); fprintf('There is no block decomposition of the model.\nUse ''block'' model''s option.\n');
end; end;
......
...@@ -49,21 +49,10 @@ function resid(period) ...@@ -49,21 +49,10 @@ function resid(period)
y =oo_.endo_simul(:); y =oo_.endo_simul(:);
z = zeros(n,period); z = zeros(n,period);
fh = str2func([M_.fname '_dynamic']); fh = str2func([M_.fname '_dynamic']);
if(options_.model_mode == 1 || options_.model_mode == 3)
addpath(M_.fname);
end;
for it_=M_.maximum_lag+1:period+M_.maximum_lag for it_=M_.maximum_lag+1:period+M_.maximum_lag
%if(options_.model_mode == 1 || options_.model_mode == 3)
% z(:,it_-M_.maximum_lag) = feval(fh,oo_.endo_simul',oo_.exo_simul, M_.params, it_);
%else
z(:,it_-M_.maximum_lag) = feval(fh,y(iyr0),oo_.exo_simul, M_.params, it_); z(:,it_-M_.maximum_lag) = feval(fh,y(iyr0),oo_.exo_simul, M_.params, it_);
iyr0 = iyr0 + n; iyr0 = iyr0 + n;
%end;
end end
if(options_.model_mode == 1 || options_.model_mode == 3)
rmpath(M_.fname);
end;
% disp([[1:period]' z']);
for i = 1:4 for i = 1:4
disp(' ') disp(' ')
......
...@@ -112,11 +112,7 @@ if ~isreal(dr.ys) ...@@ -112,11 +112,7 @@ if ~isreal(dr.ys)
end end
dr.fbias = zeros(M_.endo_nbr,1); dr.fbias = zeros(M_.endo_nbr,1);
if(options_.model_mode==1)
[dr,info,M_,options_,oo_] = dr1_sparse(dr,check_flag,M_,options_,oo_);
else
[dr,info,M_,options_,oo_] = dr1(dr,check_flag,M_,options_,oo_); [dr,info,M_,options_,oo_] = dr1(dr,check_flag,M_,options_,oo_);
end
if info(1) if info(1)
return return
end end
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment