Merge branch 'master' of github.com:DynareTeam/dynare

time-shift
Stéphane Adjemian (Telemachus) 2014-11-10 15:17:54 +01:00
commit 2e776d544a
2 changed files with 4 additions and 4 deletions

View File

@ -40,10 +40,10 @@ if ~isequal(A.freq,B.freq)
end
if isequal(A.ndat, B.ndat)
C = transpose(all(transpose(eq(A.time,B.time))));
C = logical(transpose(all(transpose(eq(A.time,B.time)))));
else
if isequal(A.ndat,1) || isequal(B.ndat,1)
C = transpose(all(transpose(bsxfun(@eq,A.time,B.time))));
C = logical(transpose(all(transpose(bsxfun(@eq,A.time,B.time)))));
else
C = false;
end

View File

@ -40,10 +40,10 @@ if ~isequal(A.freq,B.freq)
end
if isequal(A.ndat, B.ndat)
C = transpose(any(transpose(ne(A.time,B.time))));
C = logical(transpose(any(transpose(ne(A.time,B.time)))));
else
if isequal(A.ndat,1) || isequal(B.ndat,1)
C = transpose(any(transpose(bsxfun(@ne,A.time,B.time))));
C = logical(transpose(any(transpose(bsxfun(@ne,A.time,B.time)))));
else
C = false;
end