From 9795edd89221566e446a28c14c88c42e4a976ccb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Adjemian=20=28Scylla=29?= Date: Tue, 5 Nov 2013 16:27:16 +0100 Subject: [PATCH] Removed useless condition (first argument has to be a dates object). --- matlab/@dates/minus.m | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/matlab/@dates/minus.m b/matlab/@dates/minus.m index 711717e8d..252490d88 100644 --- a/matlab/@dates/minus.m +++ b/matlab/@dates/minus.m @@ -43,17 +43,12 @@ if isa(A,'dates') && isa(B,'dates') if isempty(id) return end - C(id) = A.time(id,2)-B.time(id,2) + (A.time(id,1)-B.time(id,1))*A.freq; -elseif isa(A,'dates') && ( (isvector(B) && isequal(length(B),A.ndat) && all(isint(B))) || isscalar(B) && isint(B) || isequal(length(A),1) && isvector(B) && all(isint(B))) + C(id) = A.time(id,2)-B.time(id,2) + (A.time(id,1)-B.time(id,1))*A.freq; +elseif (isvector(B) && isequal(length(B),A.ndat) && all(isint(B))) || isscalar(B) && isint(B) || isequal(length(A),1) && isvector(B) && all(isint(B)) C = dates(); C.freq = A.freq; C.time = add_periods_to_array_of_dates(A.time, A.freq, -B); C.ndat = rows(C.time); -elseif isa(B,'dates') && ( (isvector(A) && isequal(length(A),B.ndat) && all(isint(A))) || isscalar(A) && isint(A) ) - C = dates(); - C.freq = A.freq; - C.time = add_periods_to_array_of_dates(B.time, B.freq, -A); - C.ndat = rows(C.time); else error('dates::plus: I don''t understand what you want to do! Check the manual.') end