Compatibility fix for Octave: under Octave, union() called on a column vector and a scalar returns a row vector, hence the need to add the 'rows' option
parent
b63590712c
commit
c0cb3dd4fb
|
@ -76,7 +76,7 @@ if isempty(jwc)
|
||||||
temp = icc1 ;
|
temp = icc1 ;
|
||||||
else
|
else
|
||||||
ljwc = size(jwc,1) ; % length of each row in jwc
|
ljwc = size(jwc,1) ; % length of each row in jwc
|
||||||
temp = union(jwc,icc1) ; % prepares next iteration
|
temp = union(jwc,icc1,'rows') ; % prepares next iteration
|
||||||
end
|
end
|
||||||
|
|
||||||
j1 = ky(1:lky(1),1) ;
|
j1 = ky(1:lky(1),1) ;
|
||||||
|
@ -90,7 +90,7 @@ for i = 2:M_.maximum_endo_lag
|
||||||
if ljwc(i) == 0
|
if ljwc(i) == 0
|
||||||
temp = icc1;
|
temp = icc1;
|
||||||
else
|
else
|
||||||
temp = union(jwc(1:ljwc(i),i),icc1) ;
|
temp = union(jwc(1:ljwc(i),i),icc1,'rows') ;
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
[jwc,ljwc] = ffill(jwc,ljwc,[]) ;
|
[jwc,ljwc] = ffill(jwc,ljwc,[]) ;
|
||||||
|
@ -103,7 +103,7 @@ for i = 2:M_.maximum_endo_lag
|
||||||
else
|
else
|
||||||
[jwc,ljwc] = ffill(jwc,ljwc,temp) ;
|
[jwc,ljwc] = ffill(jwc,ljwc,temp) ;
|
||||||
end
|
end
|
||||||
temp = union(jwc(1:ljwc(i),i),icc1) ;
|
temp = union(jwc(1:ljwc(i),i),icc1,'rows') ;
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -112,7 +112,7 @@ ltemp = zeros(M_.maximum_endo_lag,1) ;
|
||||||
jwc1 = zeros(ncc1,M_.maximum_endo_lag) ;
|
jwc1 = zeros(ncc1,M_.maximum_endo_lag) ;
|
||||||
|
|
||||||
for i = 1:M_.maximum_endo_lag
|
for i = 1:M_.maximum_endo_lag
|
||||||
temp = union(jwc(1:ljwc(i),i),icc1) ;
|
temp = union(jwc(1:ljwc(i),i),icc1,'rows') ;
|
||||||
ltemp(i) = size(temp,1) ;
|
ltemp(i) = size(temp,1) ;
|
||||||
if ljwc(i) > 0
|
if ljwc(i) > 0
|
||||||
jwc(1:ljwc(i),i) = indnv(jwc(1:ljwc(i),i),temp) ;
|
jwc(1:ljwc(i),i) = indnv(jwc(1:ljwc(i),i),temp) ;
|
||||||
|
@ -165,7 +165,7 @@ for iter = 1:options_.maxit_
|
||||||
w = -w0*c(j1i,1:ncc1) ;
|
w = -w0*c(j1i,1:ncc1) ;
|
||||||
jwci = icc1 ;
|
jwci = icc1 ;
|
||||||
else
|
else
|
||||||
iz = union(jwci,icc1) ;
|
iz = union(jwci,icc1,'rows') ;
|
||||||
ix = indnv(jwci,iz) ;
|
ix = indnv(jwci,iz) ;
|
||||||
iy__ = indnv(icc1,iz) ;
|
iy__ = indnv(icc1,iz) ;
|
||||||
temp = zeros(size(w,1),size(iz,1)) ;
|
temp = zeros(size(w,1),size(iz,1)) ;
|
||||||
|
|
Loading…
Reference in New Issue