From beade4bea1d27fa259c4d3040ffd350c57e70ce8 Mon Sep 17 00:00:00 2001
From: ferhat <ferhat@ac1d8469-bf42-47a9-8791-bf33cf982152>
Date: Wed, 2 Sep 2009 13:07:59 +0000
Subject: [PATCH] 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
---
matlab/check.m | 6 +-----
matlab/global_initialization.m | 1 -
matlab/model_info.m | 2 +-
matlab/resid.m | 11 -----------
matlab/resol.m | 6 +-----
5 files changed, 3 insertions(+), 23 deletions(-)
diff --git a/matlab/check.m b/matlab/check.m
index 0a680ed43..e6ea8aec3 100644
--- a/matlab/check.m
+++ b/matlab/check.m
@@ -49,11 +49,7 @@ global M_ options_ oo_
oo_.exo_simul = tempex;
eigenvalues_ = dr.eigval;
- if(options_.model_mode == 1)
- nyf = dr.nyf;
- else
- nyf = nnz(dr.kstate(:,2)>M_.maximum_endo_lag+1);
- end;
+ nyf = nnz(dr.kstate(:,2)>M_.maximum_endo_lag+1);
[m_lambda,i]=sort(abs(eigenvalues_));
n_explod = nnz(abs(eigenvalues_) > options_.qz_criterium);
diff --git a/matlab/global_initialization.m b/matlab/global_initialization.m
index 1a6be4ad3..63a59f89c 100644
--- a/matlab/global_initialization.m
+++ b/matlab/global_initialization.m
@@ -113,7 +113,6 @@ function global_initialization()
options_.replic = 50;
options_.drop = 100;
options_.simul_algo = 0;
- options_.model_mode = 0;
% 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
% Hence, if mjdgges.m is visible exist(...)==2,
diff --git a/matlab/model_info.m b/matlab/model_info.m
index 7d6b98669..3f1d713dc 100644
--- a/matlab/model_info.m
+++ b/matlab/model_info.m
@@ -67,7 +67,7 @@ function model_info;
fprintf('\n\n');
end;
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;
diff --git a/matlab/resid.m b/matlab/resid.m
index 5287b8812..d8b10b312 100644
--- a/matlab/resid.m
+++ b/matlab/resid.m
@@ -49,21 +49,10 @@ function resid(period)
y =oo_.endo_simul(:);
z = zeros(n,period);
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
- %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_);
iyr0 = iyr0 + n;
- %end;
end
- if(options_.model_mode == 1 || options_.model_mode == 3)
- rmpath(M_.fname);
- end;
- % disp([[1:period]' z']);
for i = 1:4
disp(' ')
diff --git a/matlab/resol.m b/matlab/resol.m
index 944e47bfb..6b5b601ec 100644
--- a/matlab/resol.m
+++ b/matlab/resol.m
@@ -112,11 +112,7 @@ if ~isreal(dr.ys)
end
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_);
-end
+[dr,info,M_,options_,oo_] = dr1(dr,check_flag,M_,options_,oo_);
if info(1)
return
end
--
GitLab