diff --git a/matlab/@dynDates/append.m b/matlab/@dynDates/append.m index d48a3da20..fdf3bc6b0 100644 --- a/matlab/@dynDates/append.m +++ b/matlab/@dynDates/append.m @@ -38,7 +38,7 @@ if isa(a,'dynDates') B = A; return end -elseif ischar(a) && isdate(a) +elseif isdate(a) a = dynDates(a); end diff --git a/matlab/@dynDates/dynDates.m b/matlab/@dynDates/dynDates.m index 7c2bcc18a..354a98b07 100644 --- a/matlab/@dynDates/dynDates.m +++ b/matlab/@dynDates/dynDates.m @@ -73,7 +73,7 @@ switch nargin if isa(varargin{1},'dynDates') % Returns a copy of the input argument dd = varargin{1}; - elseif ischar(varargin{1}) && isdate(varargin{1}) + elseif isdate(varargin{1}) date = string2date(varargin{1}); dd.ndat = 1; dd.freq = date.freq; @@ -91,7 +91,7 @@ switch nargin otherwise dd.ndat = nargin; dd.time = NaN(dd.ndat,2); - if ischar(varargin{1}) && isdate(varargin{1}) + if isdate(varargin{1}) date = string2date(varargin{1}); dd.freq = date.freq; dd.time(1,:) = date.time; @@ -99,7 +99,7 @@ switch nargin error(['dynDates::dynDates: Input 1 has to be a string date!']) end for i=2:dd.ndat - if ischar(varargin{i}) && isdate(varargin{i}) + if isdate(varargin{i}) date = string2date(varargin{i}); if isequal(date.freq,dd.freq) dd.time(i,:) = date.time; diff --git a/matlab/@dynDates/pop.m b/matlab/@dynDates/pop.m index d3d9acc5e..c75d756da 100644 --- a/matlab/@dynDates/pop.m +++ b/matlab/@dynDates/pop.m @@ -40,7 +40,7 @@ if nargin<2 return 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.']) end