Removed useless conditions.
git-svn-id: https://www.dynare.org/svn/dynare/dynare_v4@1499 ac1d8469-bf42-47a9-8791-bf33cf982152time-shift
parent
7108106807
commit
13241ddc68
15
matlab/dr1.m
15
matlab/dr1.m
|
@ -450,8 +450,7 @@ zx=[zx; zeros(M_.exo_nbr,np);zeros(M_.exo_det_nbr,np)];
|
||||||
zu=[zu; eye(M_.exo_nbr);zeros(M_.exo_det_nbr,M_.exo_nbr)];
|
zu=[zu; eye(M_.exo_nbr);zeros(M_.exo_det_nbr,M_.exo_nbr)];
|
||||||
[nrzx,nczx] = size(zx);
|
[nrzx,nczx] = size(zx);
|
||||||
|
|
||||||
if ~exist('sparse_hessian_times_B_kronecker_C') | ((strcmp(version('-release'),'2007b') ...
|
if ~exist('sparse_hessian_times_B_kronecker_C')
|
||||||
~= 1) & strcmpi(computer,'PCWIN'))
|
|
||||||
if nrzx*nrzx*nczx*nczx > 1e7
|
if nrzx*nrzx*nczx*nczx > 1e7
|
||||||
rhs = zeros(M_.endo_nbr,nczx*nczx);
|
rhs = zeros(M_.endo_nbr,nczx*nczx);
|
||||||
k1 = 1;
|
k1 = 1;
|
||||||
|
@ -528,7 +527,7 @@ hu = dr.ghu(nstatic+1:nstatic+npred,:);
|
||||||
%kk = reshape([1:np*np],np,np);
|
%kk = reshape([1:np*np],np,np);
|
||||||
%kk = kk(1:npred,1:npred);
|
%kk = kk(1:npred,1:npred);
|
||||||
%rhs = -hessian*kron(zx,zu)-f1*dr.ghxx(end-nyf+1:end,kk(:))*kron(hx(1:npred,:),hu(1:npred,:));
|
%rhs = -hessian*kron(zx,zu)-f1*dr.ghxx(end-nyf+1:end,kk(:))*kron(hx(1:npred,:),hu(1:npred,:));
|
||||||
if ~exist('sparse_hessian_times_B_kronecker_C') %| ((strcmp(version('-release'),'2007b')~= 1) & strcmpi(computer,'PCWIN'))
|
if ~exist('sparse_hessian_times_B_kronecker_C')
|
||||||
if nrzx*nrzx*nczx*M_.exo_nbr > 1e7
|
if nrzx*nrzx*nczx*M_.exo_nbr > 1e7
|
||||||
rhs = zeros(M_.endo_nbr,nczx*M_.exo_nbr);
|
rhs = zeros(M_.endo_nbr,nczx*M_.exo_nbr);
|
||||||
k1 = 1;
|
k1 = 1;
|
||||||
|
@ -549,7 +548,7 @@ hu1 = [hu;zeros(np-npred,M_.exo_nbr)];
|
||||||
%B1 = [B(1:M_.endo_nbr,:);zeros(size(A,1)-M_.endo_nbr,size(B,2))];
|
%B1 = [B(1:M_.endo_nbr,:);zeros(size(A,1)-M_.endo_nbr,size(B,2))];
|
||||||
[nrhx,nchx] = size(hx);
|
[nrhx,nchx] = size(hx);
|
||||||
[nrhu1,nchu1] = size(hu1);
|
[nrhu1,nchu1] = size(hu1);
|
||||||
if ~exist('A_times_B_kronecker_C') | ((strcmp(version('-release'),'2007b')~= 1) & strcmpi(computer,'PCWIN'))
|
if ~exist('A_times_B_kronecker_C')
|
||||||
if nrhx*nrhu1*nchx*nchu1 > 1e7
|
if nrhx*nrhu1*nchx*nchu1 > 1e7
|
||||||
B1 = zeros(size(dr.ghxx,1),nchx*nchu1);
|
B1 = zeros(size(dr.ghxx,1),nchx*nchu1);
|
||||||
k1 = 1;
|
k1 = 1;
|
||||||
|
@ -576,7 +575,7 @@ dr.ghxu = A\rhs;
|
||||||
%rhs
|
%rhs
|
||||||
kk = reshape([1:np*np],np,np);
|
kk = reshape([1:np*np],np,np);
|
||||||
kk = kk(1:npred,1:npred);
|
kk = kk(1:npred,1:npred);
|
||||||
if ~exist('sparse_hessian_times_B_kronecker_C') %| ((strcmp(version('-release'),'2007b')~= 1) & strcmpi(computer,'PCWIN'))
|
if ~exist('sparse_hessian_times_B_kronecker_C')
|
||||||
if nrzx*nrzx*M_.exo_nbr*M_.exo_nbr > 1e7
|
if nrzx*nrzx*M_.exo_nbr*M_.exo_nbr > 1e7
|
||||||
rhs = zeros(M_.endo_nbr,M_.exo_nbr*M_.exo_nbr);
|
rhs = zeros(M_.endo_nbr,M_.exo_nbr*M_.exo_nbr);
|
||||||
k1 = 1;
|
k1 = 1;
|
||||||
|
@ -592,7 +591,7 @@ if ~exist('sparse_hessian_times_B_kronecker_C') %| ((strcmp(version('-release'),
|
||||||
else
|
else
|
||||||
rhs = sparse_hessian_times_B_kronecker_C(hessian,zu);
|
rhs = sparse_hessian_times_B_kronecker_C(hessian,zu);
|
||||||
end
|
end
|
||||||
if ~exist('A_times_B_kronecker_C') | ((strcmp(version('-release'),'2007b') ~= 1) & strcmpi(computer,'PCWIN'))
|
if ~exist('A_times_B_kronecker_C')
|
||||||
if nrhu1*nrhu1*nchu1*nchu1 > 1e7
|
if nrhu1*nrhu1*nchu1*nchu1 > 1e7
|
||||||
B1 = zeros(size(dr.ghxx,1),nchu1*nchu1);
|
B1 = zeros(size(dr.ghxx,1),nchu1*nchu1);
|
||||||
k1 = 1;
|
k1 = 1;
|
||||||
|
@ -652,7 +651,7 @@ for i=1:M_.maximum_endo_lead
|
||||||
[junk,k3a,k3] = ...
|
[junk,k3a,k3] = ...
|
||||||
find(M_.lead_lag_incidenceordered(M_.maximum_endo_lag+j+1,:));
|
find(M_.lead_lag_incidenceordered(M_.maximum_endo_lag+j+1,:));
|
||||||
nk3a = length(k3a);
|
nk3a = length(k3a);
|
||||||
if ~exist('sparse_hessian_times_B_kronecker_C') | %((strcmp(version('-release'),'2007b')~= 1) & strcmpi(computer,'PCWIN'))
|
if ~exist('sparse_hessian_times_B_kronecker_C')
|
||||||
if nk3a*nk3a*M_.exo_nbr*M_.exo_nbr > 1e7
|
if nk3a*nk3a*M_.exo_nbr*M_.exo_nbr > 1e7
|
||||||
B1 = zeros(M_.endo_nbr,M_.exo_nbr*M_.exo_nbr);
|
B1 = zeros(M_.endo_nbr,M_.exo_nbr*M_.exo_nbr);
|
||||||
k1 = 1;
|
k1 = 1;
|
||||||
|
@ -684,7 +683,7 @@ for i=1:M_.maximum_endo_lead
|
||||||
kk = find(kstate(:,2) == M_.maximum_endo_lag+i+1);
|
kk = find(kstate(:,2) == M_.maximum_endo_lag+i+1);
|
||||||
gu = dr.ghx*Gu;
|
gu = dr.ghx*Gu;
|
||||||
[nrGu,ncGu] = size(Gu);
|
[nrGu,ncGu] = size(Gu);
|
||||||
if ~exist('A_times_B_kronecker_C') | ((strcmp(version('-release'),'2007b')~= 1) & strcmpi(computer,'PCWIN'))
|
if ~exist('A_times_B_kronecker_C')
|
||||||
if nrGu*nrGu*ncGu*ncGu > 1e7
|
if nrGu*nrGu*ncGu*ncGu > 1e7
|
||||||
G1 = zeros(M_.endo_nbr,ncGu*ncGu);
|
G1 = zeros(M_.endo_nbr,ncGu*ncGu);
|
||||||
G2 = zeros(size(hxx,1),ncGu*ncGu);
|
G2 = zeros(size(hxx,1),ncGu*ncGu);
|
||||||
|
|
Loading…
Reference in New Issue