stepan
/
dynare
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v3+v4 dr1.m: corrected name collision in dimensions of zx 

git-svn-id: https://www.dynare.org/svn/dynare/dynare_v4@1009 ac1d8469-bf42-47a9-8791-bf33cf982152
time-shift
michel 2006-11-01 09:09:44 +00:00
parent c276dc4a3b
commit 1babb208f6
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
matlab/dr1.m
View File

@ -404,12 +404,12 @@ for i=1:M_.maximum_endo_lead
end end
zx=[zx; zeros(M_.exo_nbr,np);zeros(M_.exo_det_nbr,np)]; 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)];
[n1,n2] = size(zx); [nrzx,nczx] = size(zx);
if n1*n1*n2*n2 > 1e7 if nrzx*nrzx*nczx*nczx > 1e7
rhs = zeros(M_.endo_nbr,n2*n2); rhs = zeros(M_.endo_nbr,nczx*nczx);
k1 = 1; k1 = 1;
for i1 = 1:n2 for i1 = 1:nczx
for i2 = 1:n2 for i2 = 1:nczx
rhs(:,k1) = hessian*kron(zx(:,i1),zx(:,i2)); rhs(:,k1) = hessian*kron(zx(:,i1),zx(:,i2));
k1 = k1 + 1; k1 = k1 + 1;
end end
@ -477,10 +477,10 @@ 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 n1*n1*n2*M_.exo_nbr > 1e7 if nrzx*nrzx*nczx*M_.exo_nbr > 1e7
rhs = zeros(M_.endo_nbr,n2*M_.exo_nbr); rhs = zeros(M_.endo_nbr,nczx*M_.exo_nbr);
k1 = 1; k1 = 1;
for i1 = 1:n2 for i1 = 1:nczx
for i2 = 1:M_.exo_nbr for i2 = 1:M_.exo_nbr
rhs(:,k1) = hessian*kron(zx(:,i1),zu(:,i2)); rhs(:,k1) = hessian*kron(zx(:,i1),zu(:,i2));
k1 = k1 + 1; k1 = k1 + 1;
@ -502,7 +502,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 n1*n1*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;
for i1 = 1:M_.exo_nbr for i1 = 1:M_.exo_nbr