Use new version of isdate routine.
parent
068564628d
commit
ff292fa67b
|
@ -38,7 +38,7 @@ if isa(a,'dynDates')
|
||||||
B = A;
|
B = A;
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
elseif ischar(a) && isdate(a)
|
elseif isdate(a)
|
||||||
a = dynDates(a);
|
a = dynDates(a);
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -73,7 +73,7 @@ switch nargin
|
||||||
if isa(varargin{1},'dynDates')
|
if isa(varargin{1},'dynDates')
|
||||||
% Returns a copy of the input argument
|
% Returns a copy of the input argument
|
||||||
dd = varargin{1};
|
dd = varargin{1};
|
||||||
elseif ischar(varargin{1}) && isdate(varargin{1})
|
elseif isdate(varargin{1})
|
||||||
date = string2date(varargin{1});
|
date = string2date(varargin{1});
|
||||||
dd.ndat = 1;
|
dd.ndat = 1;
|
||||||
dd.freq = date.freq;
|
dd.freq = date.freq;
|
||||||
|
@ -91,7 +91,7 @@ switch nargin
|
||||||
otherwise
|
otherwise
|
||||||
dd.ndat = nargin;
|
dd.ndat = nargin;
|
||||||
dd.time = NaN(dd.ndat,2);
|
dd.time = NaN(dd.ndat,2);
|
||||||
if ischar(varargin{1}) && isdate(varargin{1})
|
if isdate(varargin{1})
|
||||||
date = string2date(varargin{1});
|
date = string2date(varargin{1});
|
||||||
dd.freq = date.freq;
|
dd.freq = date.freq;
|
||||||
dd.time(1,:) = date.time;
|
dd.time(1,:) = date.time;
|
||||||
|
@ -99,7 +99,7 @@ switch nargin
|
||||||
error(['dynDates::dynDates: Input 1 has to be a string date!'])
|
error(['dynDates::dynDates: Input 1 has to be a string date!'])
|
||||||
end
|
end
|
||||||
for i=2:dd.ndat
|
for i=2:dd.ndat
|
||||||
if ischar(varargin{i}) && isdate(varargin{i})
|
if isdate(varargin{i})
|
||||||
date = string2date(varargin{i});
|
date = string2date(varargin{i});
|
||||||
if isequal(date.freq,dd.freq)
|
if isequal(date.freq,dd.freq)
|
||||||
dd.time(i,:) = date.time;
|
dd.time(i,:) = date.time;
|
||||||
|
|
|
@ -40,7 +40,7 @@ if nargin<2
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
if ~(isa(a,'dynDates') || (ischar(a) && isdate(a)) || (isscalar(a) && isint(a)))
|
if ~(isa(a,'dynDates') || isdate(a) || (isscalar(a) && isint(a)))
|
||||||
error(['dynDates::pop: Input argument ' inputname(2) ' has to be a dynDates object with a single element, a string (which can be interpreted as a date) or an integer.'])
|
error(['dynDates::pop: Input argument ' inputname(2) ' has to be a dynDates object with a single element, a string (which can be interpreted as a date) or an integer.'])
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue