Fixed bug (return wrong type when one of the argument is an integer).
parent
f9315f1409
commit
87c8083b16
|
@ -39,9 +39,15 @@ if isa(A,'dynDates') && isa(B,'dynDates')
|
||||||
C.time = [A.time; B.time];
|
C.time = [A.time; B.time];
|
||||||
C.ndat = A.ndat+B.ndat;
|
C.ndat = A.ndat+B.ndat;
|
||||||
elseif isa(A,'dynDates') && ( (isvector(B) && isequal(length(B),A.ndat) && all(isint(B))) || isscalar(B) && isint(B) || isequal(length(A),1) && isvector(B) && all(isint(B)))
|
elseif isa(A,'dynDates') && ( (isvector(B) && isequal(length(B),A.ndat) && all(isint(B))) || isscalar(B) && isint(B) || isequal(length(A),1) && isvector(B) && all(isint(B)))
|
||||||
|
C = dynDates();
|
||||||
|
C.freq = A.freq;
|
||||||
C.time = add_periods_to_array_of_dates(A.time, A.freq, B);
|
C.time = add_periods_to_array_of_dates(A.time, A.freq, B);
|
||||||
|
C.ndat = rows(C.time);
|
||||||
elseif isa(B,'dynDates') && ( (isvector(A) && isequal(length(A),B.ndat) && all(isint(A))) || isscalar(A) && isint(A) )
|
elseif isa(B,'dynDates') && ( (isvector(A) && isequal(length(A),B.ndat) && all(isint(A))) || isscalar(A) && isint(A) )
|
||||||
|
C = dynDates();
|
||||||
|
C.freq = B.freq;
|
||||||
C.time = add_periods_to_array_of_dates(B.time, B.freq, A);
|
C.time = add_periods_to_array_of_dates(B.time, B.freq, A);
|
||||||
|
C.ndat = rows(C.time);
|
||||||
else
|
else
|
||||||
error('dynDates::plus: I don''t understand what you want to do! Check the manual.')
|
error('dynDates::plus: I don''t understand what you want to do! Check the manual.')
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue