diff --git a/src/@arima/arima.m b/src/@arima/arima.m index d6dc8da0b97e206a87cd061ad934883be05fff28..425464115488b8ab836f794123f1fa5b71b08ed2 100644 --- a/src/@arima/arima.m +++ b/src/@arima/arima.m @@ -1,8 +1,8 @@ -classdef arima<handle % --*-- Unitary tests --*-- +classdef arima<handle % Class for ARIMA models (interface to X13). -% Copyright © 2017-2022 Dynare Team +% Copyright © 2017-2023 Dynare Team % % This code is free software: you can redistribute it and/or modify % it under the terms of the GNU General Public License as published by @@ -151,7 +151,7 @@ methods end end % arima end % methods -end % classdef +end % classdef --*-- Unit tests --*-- %@test:1 %$ try diff --git a/src/@dates/append.m b/src/@dates/append.m index 6e3f412e15193b51167533a0b38fcbe35fd32d4b..696a321d6c3697f46a7ccbe878755f36ac43f453 100644 --- a/src/@dates/append.m +++ b/src/@dates/append.m @@ -1,4 +1,4 @@ -function o = append(o, d) % --*-- Unitary tests --*-- +function o = append(o, d) % append method for dates class. % @@ -9,7 +9,7 @@ function o = append(o, d) % --*-- Unitary tests --*-- % OUTPUTS % - o [dates] containing dates defined in o and d. -% Copyright © 2012-2021 Dynare Team +% Copyright © 2012-2022 Dynare Team % % This code is free software: you can redistribute it and/or modify % it under the terms of the GNU General Public License as published by @@ -42,7 +42,7 @@ end o = copy(o); o.append_(d); -return +return % --*-- Unit tests --*-- %@test:1 % Define some dates diff --git a/src/@dates/append_.m b/src/@dates/append_.m index 398f0325899c65b2794e084c7eb57df055972763..db4e1db389b0f2dcd2f761344fdf2fb44c764035 100644 --- a/src/@dates/append_.m +++ b/src/@dates/append_.m @@ -1,4 +1,4 @@ -function o = append_(o, d) % --*-- Unitary tests --*-- +function o = append_(o, d) % append method for dates class (in place modification). % @@ -9,7 +9,7 @@ function o = append_(o, d) % --*-- Unitary tests --*-- % OUTPUTS % - o [dates] dates object containing dates defined in o and d. -% Copyright © 2012-2021 Dynare Team +% Copyright © 2012-2022 Dynare Team % % This code is free software: you can redistribute it and/or modify % it under the terms of the GNU General Public License as published by @@ -41,7 +41,7 @@ end o.time = [o.time; d.time]; -return +return % --*-- Unit tests --*-- %@test:1 % Define some dates diff --git a/src/@dates/char.m b/src/@dates/char.m index b68b2e1c3cc9e78422e4784ea98fbd71fb1d1a12..b6f03f5190703292058c2be64172109f4e78d830 100644 --- a/src/@dates/char.m +++ b/src/@dates/char.m @@ -1,4 +1,4 @@ -function s = char(o) % --*-- Unitary tests --*-- +function s = char(o) % Given a one element dates object, returns a string with the formatted date. % @@ -8,7 +8,7 @@ function s = char(o) % --*-- Unitary tests --*-- % OUTPUTS % - s [string] -% Copyright © 2014-2021 Dynare Team +% Copyright © 2014-2023 Dynare Team % % This code is free software: you can redistribute it and/or modify % it under the terms of the GNU General Public License as published by @@ -29,7 +29,7 @@ end s = date2string(o.time, o.freq); -return +return % --*-- Unit tests --*-- %@test:1 % Define a dates object diff --git a/src/@dates/colon.m b/src/@dates/colon.m index 0e0035c1d997cc221c9af0be940fe406282d415d..e400eee4974d5cc7fdaca6e5c3027a1a8cf48bd5 100644 --- a/src/@dates/colon.m +++ b/src/@dates/colon.m @@ -1,4 +1,4 @@ -function q = colon(varargin) % --*-- Unitary tests --*-- +function q = colon(varargin) % Overloads the colon operator (:). This method can be used to create ranges of dates. % @@ -14,7 +14,7 @@ function q = colon(varargin) % --*-- Unitary tests --*-- % 1. p must be greater than o if d>0. % 2. p and q are dates objects with one element. -% Copyright © 2013-2021 Dynare Team +% Copyright © 2013-2023 Dynare Team % % This code is free software: you can redistribute it and/or modify % it under the terms of the GNU General Public License as published by @@ -72,7 +72,7 @@ q.freq = o.freq; % Set time q.time = transpose(o.time:d:p.time); -return +return % --*-- Unit tests --*-- %@test:1 % Define two dates @@ -172,4 +172,4 @@ d = dd(1950, 01, 28):dd(1950, 01, 30); t(1) = isequal(d.time(:,1), e.time(:,1)); t(2) = isequal(d.freq, e.freq); T = all(t); -%@eof:6 \ No newline at end of file +%@eof:6 diff --git a/src/@dates/copy.m b/src/@dates/copy.m index 59a79ab96212378656647782c6d590cfb7ab59c9..2abcca9da543d0e3fc92a0cf559816d1a25a53be 100644 --- a/src/@dates/copy.m +++ b/src/@dates/copy.m @@ -1,4 +1,4 @@ -function p = copy(o) % --*-- Unitary tests --*-- +function p = copy(o) % Do a copy of a dates object. % @@ -8,7 +8,7 @@ function p = copy(o) % --*-- Unitary tests --*-- % OUTPUTS % - p [dates] -% Copyright © 2014-2020 Dynare Team +% Copyright © 2014-2023 Dynare Team % % This code is free software: you can redistribute it and/or modify % it under the terms of the GNU General Public License as published by @@ -27,7 +27,7 @@ p = dates(); p.freq = o.freq; p.time = o.time; -return +return % --*-- Unit tests --*-- %@test:1 % Define a dates object @@ -48,4 +48,4 @@ if t(1) end T = all(t); -%@eof:1 \ No newline at end of file +%@eof:1 diff --git a/src/@dates/dates.m b/src/@dates/dates.m index fe98faafecd8933e0ebd33b3f36cc6cfd5c4a05d..549bb24ad80416ba5fe078c9288f7aea655016a8 100644 --- a/src/@dates/dates.m +++ b/src/@dates/dates.m @@ -1,6 +1,6 @@ -classdef dates<handle % --*-- Unitary tests --*-- +classdef dates<handle -% Copyright © 2014-2021 Dynare Team +% Copyright © 2014-2023 Dynare Team % % This code is free software: you can redistribute it and/or modify % it under the terms of the GNU General Public License as published by @@ -193,8 +193,7 @@ methods n = ndat(o); n = length(o); end % methods -end % classdef - +end % classdef --*-- Unit tests --*-- %@test:1 %$ % Define some dates @@ -378,4 +377,4 @@ end % classdef %$ end %$ %$ T = all(t); -%@eof:10 \ No newline at end of file +%@eof:10 diff --git a/src/@dates/double.m b/src/@dates/double.m index 8a96eed5519352041afb4b8decf9fa3758c61fee..26a4043d0257d66f935af002b81a01985258e241 100644 --- a/src/@dates/double.m +++ b/src/@dates/double.m @@ -1,4 +1,4 @@ -function [m, f] = double(o) % --*-- Unitary tests --*-- +function [m, f] = double(o) % Returns a vector of doubles with the fractional part corresponding % to the subperiod. Used for plots and to store dates in a matrix. @@ -13,7 +13,7 @@ function [m, f] = double(o) % --*-- Unitary tests --*-- % REMARKS % Obviously the frequency is lost during the conversion. -% Copyright © 2013-2021 Dynare Team +% Copyright © 2013-2022 Dynare Team % % This code is free software: you can redistribute it and/or modify % it under the terms of the GNU General Public License as published by @@ -45,7 +45,7 @@ if nargout>1 f = o.freq; end -return +return % --*-- Unit tests --*-- %@test:1 % Define a dates object diff --git a/src/@dates/end.m b/src/@dates/end.m index b0913ddb31461119db00b79701f5c7b7eb8ec25c..4c7b92861a9ce9c2d917427f1ab9ab2a9881ea45 100644 --- a/src/@dates/end.m +++ b/src/@dates/end.m @@ -1,4 +1,4 @@ -function lastIndex = end(o, k, n) % --*-- Unitary tests --*-- +function lastIndex = end(o, k, n) % Overloads end keyword. % @@ -10,7 +10,7 @@ function lastIndex = end(o, k, n) % --*-- Unitary tests --*-- % OUTPUTS % lastIndex [integer] last dates index -% Copyright © 2013-2021 Dynare Team +% Copyright © 2013-2022 Dynare Team % % This code is free software: you can redistribute it and/or modify % it under the terms of the GNU General Public License as published by @@ -28,7 +28,7 @@ function lastIndex = end(o, k, n) % --*-- Unitary tests --*-- assert(k==1 && n==1, 'dates:end:ArgCheck', 'dates only has one dimension'); lastIndex = o.ndat(); -return +return % --*-- Unit tests --*-- %@test:1 % Define a dates object diff --git a/src/@dates/eq.m b/src/@dates/eq.m index 9d64d881b0b8cc3d8adbfba30e658deeec112f76..f8b6362496d5777a6aea5fd1502afd20c0841f10 100644 --- a/src/@dates/eq.m +++ b/src/@dates/eq.m @@ -1,4 +1,4 @@ -function l = eq(varargin) % --*-- Unitary tests --*-- +function l = eq(varargin) % Overloads == operator for dates objects. % @@ -9,7 +9,7 @@ function l = eq(varargin) % --*-- Unitary tests --*-- % OUTPUTS % - l [logical] column vector of max(n,1) elements (zeros or ones). -% Copyright © 2013-2020 Dynare Team +% Copyright © 2013-2022 Dynare Team % % This code is free software: you can redistribute it and/or modify % it under the terms of the GNU General Public License as published by @@ -37,7 +37,7 @@ else l = bsxfun(@eq,o.time(:,1),p.time(:,1)); end -return +return % --*-- Unit tests --*-- %@test:1 % Define some dates objects @@ -134,4 +134,4 @@ if t(1) end T = all(t); -%@eof:4 \ No newline at end of file +%@eof:4 diff --git a/src/@dates/ge.m b/src/@dates/ge.m index 96b201eb2840d50f40fbcea00379fed1d6efa96a..0c1d7c8cfdf739a128f5720ee1b8ef8ac363bd0e 100644 --- a/src/@dates/ge.m +++ b/src/@dates/ge.m @@ -1,4 +1,4 @@ -function l = ge(varargin) % --*-- Unitary tests --*-- +function l = ge(varargin) % Overloads the >= operator for dates objects. % @@ -9,7 +9,7 @@ function l = ge(varargin) % --*-- Unitary tests --*-- % OUTPUTS % - l [logical] column vector of max(n,1) elements (zeros or ones). -% Copyright © 2013-2021 Dynare Team +% Copyright © 2013-2022 Dynare Team % % This code is free software: you can redistribute it and/or modify % it under the terms of the GNU General Public License as published by @@ -28,7 +28,7 @@ function l = ge(varargin) % --*-- Unitary tests --*-- l = o.time>=p.time; -return +return % --*-- Unit tests --*-- %@test:1 % Define some dates diff --git a/src/@dates/gt.m b/src/@dates/gt.m index 52a6aed1cf1b159ec18f97070a6960f4a05336a6..cb73869d6936614d189580f2b9e682e607209282 100644 --- a/src/@dates/gt.m +++ b/src/@dates/gt.m @@ -1,4 +1,4 @@ -function l = gt(varargin) % --*-- Unitary tests --*-- +function l = gt(varargin) % Overloads the > operator for dates objects. % @@ -9,7 +9,7 @@ function l = gt(varargin) % --*-- Unitary tests --*-- % OUTPUTS % - l [logical] column vector of max(n,1) elements (zeros or ones). -% Copyright © 2013-2021 Dynare Team +% Copyright © 2013-2022 Dynare Team % % This code is free software: you can redistribute it and/or modify % it under the terms of the GNU General Public License as published by @@ -28,7 +28,7 @@ function l = gt(varargin) % --*-- Unitary tests --*-- l = o.time>p.time; -return +return % --*-- Unit tests --*-- %@test:1 % Define some dates diff --git a/src/@dates/horzcat.m b/src/@dates/horzcat.m index abda27b9bb21d3b324986994f4add884983f677f..024703354b987d9ff773f6a69ee9d23de2b15c58 100644 --- a/src/@dates/horzcat.m +++ b/src/@dates/horzcat.m @@ -1,4 +1,4 @@ -function o = horzcat(varargin) % --*-- Unitary tests --*-- +function o = horzcat(varargin) % Overloads the horzcat method for dates objects. % @@ -8,7 +8,7 @@ function o = horzcat(varargin) % --*-- Unitary tests --*-- % OUTPUTS % - o [dates] object containing dates defined in varargin{:} -% Copyright © 2013-2021 Dynare Team +% Copyright © 2013-2022 Dynare Team % % This code is free software: you can redistribute it and/or modify % it under the terms of the GNU General Public License as published by @@ -43,7 +43,7 @@ for i=2:nargin end end -return +return % --*-- Unit tests --*-- %@test:1 % Define some dates @@ -165,4 +165,4 @@ if t(1) end T = all(t); -%@eof:6 \ No newline at end of file +%@eof:6 diff --git a/src/@dates/intersect.m b/src/@dates/intersect.m index 61aca8c881430b2dfbc0786c3b6724eabfe2add9..cace90516fe1e43c431a1189e4c37d9e9edd8681 100644 --- a/src/@dates/intersect.m +++ b/src/@dates/intersect.m @@ -1,4 +1,4 @@ -function q = intersect(o, p) % --*-- Unitary tests --*-- +function q = intersect(o, p) % Overloads intersect function for dates objects. % @@ -9,7 +9,7 @@ function q = intersect(o, p) % --*-- Unitary tests --*-- % OUTPUTS % - q [dates] All the common elements in o and p. -% Copyright © 2013-2021 Dynare Team +% Copyright © 2013-2022 Dynare Team % % This code is free software: you can redistribute it and/or modify % it under the terms of the GNU General Public License as published by @@ -48,7 +48,7 @@ end q.freq = o.freq; q.time = time; -return +return % --*-- Unit tests --*-- %@test:1 % Define some dates objects diff --git a/src/@dates/isempty.m b/src/@dates/isempty.m index 770d0a4da4cadca73eb730010e0f455dc3759387..97e59bffb417b69a121996a78107fa229746d5f7 100644 --- a/src/@dates/isempty.m +++ b/src/@dates/isempty.m @@ -1,4 +1,4 @@ -function l = isempty(o) % --*-- Unitary tests --*-- +function l = isempty(o) % Returns true (1) if and only if o dates object is empty. % @@ -8,7 +8,7 @@ function l = isempty(o) % --*-- Unitary tests --*-- % OUTPUTS % - l [logical] -% Copyright © 2013-2021 Dynare Team +% Copyright © 2013-2022 Dynare Team % % This code is free software: you can redistribute it and/or modify % it under the terms of the GNU General Public License as published by @@ -25,7 +25,7 @@ function l = isempty(o) % --*-- Unitary tests --*-- l = isequal(o.ndat(), 0); -return +return % --*-- Unit tests --*-- %@test:1 % Instantiate an empty dates object diff --git a/src/@dates/isequal.m b/src/@dates/isequal.m index 6f923a672c2353b42e0f0dbcc07143a8b41b2357..9df782911c90fb006c7756aa447e2927f5958ea2 100644 --- a/src/@dates/isequal.m +++ b/src/@dates/isequal.m @@ -1,4 +1,4 @@ -function l = isequal(o, p, fake) % --*-- Unitary tests --*-- +function l = isequal(o, p, fake) % Overloads isequal function for dates objects. Returns true true iff o and p have the same elements. % @@ -9,7 +9,7 @@ function l = isequal(o, p, fake) % --*-- Unitary tests --*-- % OUTPUTS % - l [logical] -% Copyright © 2013-2021 Dynare Team +% Copyright © 2013-2022 Dynare Team % % This code is free software: you can redistribute it and/or modify % it under the terms of the GNU General Public License as published by @@ -30,7 +30,7 @@ end l = isequal(o.freq, p.freq) && isequal(o.time, p.time); -return +return % --*-- Unit tests --*-- %@test:1 d1 = dates('1938Q1'); diff --git a/src/@dates/le.m b/src/@dates/le.m index 83687464ee707578dd12b3e063dda215c0b22e5c..2d1f3078076b71924e201630df6531fab14bcf34 100644 --- a/src/@dates/le.m +++ b/src/@dates/le.m @@ -1,4 +1,4 @@ -function l = le(varargin) % --*-- Unitary tests --*-- +function l = le(varargin) % Overloads the <= operator for dates objects. % @@ -9,7 +9,7 @@ function l = le(varargin) % --*-- Unitary tests --*-- % OUTPUTS % - l [logical] column vector of max(n,1) elements (zeros or ones). -% Copyright © 2013-2021 Dynare Team +% Copyright © 2013-2022 Dynare Team % % This code is free software: you can redistribute it and/or modify % it under the terms of the GNU General Public License as published by @@ -28,7 +28,7 @@ function l = le(varargin) % --*-- Unitary tests --*-- l = o.time<=p.time; -return +return % --*-- Unit tests --*-- %@test:1 % Define some dates diff --git a/src/@dates/length.m b/src/@dates/length.m index 0307cb6cee88446ca812b422eeb949bc15415eed..0e2a33f668320c1b550c7892047a54ee2aa792e0 100644 --- a/src/@dates/length.m +++ b/src/@dates/length.m @@ -1,4 +1,4 @@ -function n = length(o) % --*-- Unitary tests --*-- +function n = length(o) % Returns the number of elements in a dates object. % @@ -8,7 +8,7 @@ function n = length(o) % --*-- Unitary tests --*-- % OUTPUTS % - n [integer] Number of elements in o. -% Copyright © 2013-2021 Dynare Team +% Copyright © 2013-2022 Dynare Team % % This code is free software: you can redistribute it and/or modify % it under the terms of the GNU General Public License as published by @@ -25,7 +25,7 @@ function n = length(o) % --*-- Unitary tests --*-- n = o.ndat(); -return +return % --*-- Unit tests --*-- %@test:1 d = dates('1938Q1'); diff --git a/src/@dates/lt.m b/src/@dates/lt.m index 3dc091e45bb1b7c024f09464c9a8fad6b8384fd9..67b07a56905d4ada1cf3eb751422b7c84a2c8e8a 100644 --- a/src/@dates/lt.m +++ b/src/@dates/lt.m @@ -1,4 +1,4 @@ -function l = lt(varargin) % --*-- Unitary tests --*-- +function l = lt(varargin) % Overloads the < operator for dates objects. % @@ -9,7 +9,7 @@ function l = lt(varargin) % --*-- Unitary tests --*-- % OUTPUTS % - l [logical] column vector of max(n,1) elements (zeros or ones). -% Copyright © 2013-2021 Dynare Team +% Copyright © 2013-2022 Dynare Team % % This code is free software: you can redistribute it and/or modify % it under the terms of the GNU General Public License as published by @@ -28,7 +28,7 @@ function l = lt(varargin) % --*-- Unitary tests --*-- l = o.time<p.time; -return +return % --*-- Unit tests --*-- %@test:1 % Define some dates diff --git a/src/@dates/max.m b/src/@dates/max.m index ecaa3b77d9ffb36f263c842c4e71300f1685a2c2..1148bfdd44c01670ec40dffdb1b170a6859a5ef0 100644 --- a/src/@dates/max.m +++ b/src/@dates/max.m @@ -1,4 +1,4 @@ -function q = max(varargin) % --*-- Unitary tests --*-- +function q = max(varargin) % Overloads the max function for dates objects. % @@ -8,7 +8,7 @@ function q = max(varargin) % --*-- Unitary tests --*-- % OUTPUTS % - q [dates] -% Copyright © 2013-2021 Dynare Team +% Copyright © 2013-2022 Dynare Team % % This code is free software: you can redistribute it and/or modify % it under the terms of the GNU General Public License as published by @@ -36,7 +36,7 @@ switch nargin q = max(horzcat(varargin{:})); end -return +return % --*-- Unit tests --*-- %@test:1 % Define some dates diff --git a/src/@dates/min.m b/src/@dates/min.m index c993a28acc1f2ed797e5c88150f29f248b9695c9..70300abcef3fc09f6dc90c08d380abcf6588d54b 100644 --- a/src/@dates/min.m +++ b/src/@dates/min.m @@ -1,4 +1,4 @@ -function q = min(varargin) % --*-- Unitary tests --*-- +function q = min(varargin) % Overloads the min function for dates objects. % @@ -8,7 +8,7 @@ function q = min(varargin) % --*-- Unitary tests --*-- % OUTPUTS % - q [dates] -% Copyright © 2013-2021 Dynare Team +% Copyright © 2013-2022 Dynare Team % % This code is free software: you can redistribute it and/or modify % it under the terms of the GNU General Public License as published by @@ -36,7 +36,7 @@ switch nargin q = min(horzcat(varargin{:})); end -return +return % --*-- Unit tests --*-- %@test:1 % Define some dates diff --git a/src/@dates/minus.m b/src/@dates/minus.m index 6f622c2dbf256d2ab66742a8c045c4a98382a552..26fa04a22c8780682f6f72e441d875fee00e8221 100644 --- a/src/@dates/minus.m +++ b/src/@dates/minus.m @@ -1,4 +1,4 @@ -function q = minus(o,p) % --*-- Unitary tests --*-- +function q = minus(o,p) % Overloads the minus operator (-). If o and p are dates objects, the method . If % one of the inputs is an integer or a vector of integers, the method shifts the dates object by X (the interger input) periods backward. @@ -18,7 +18,7 @@ function q = minus(o,p) % --*-- Unitary tests --*-- % p periods backward. % 3. If o is not a dates object, an error is returned. -% Copyright © 2013-2021 Dynare Team +% Copyright © 2013-2023 Dynare Team % % This code is free software: you can redistribute it and/or modify % it under the terms of the GNU General Public License as published by @@ -68,7 +68,7 @@ else error('dates:minus:ArgCheck', 'You should read the manual.') end -return +return % --*-- Unit tests --*-- %@test:1 % Define some dates objects diff --git a/src/@dates/mtimes.m b/src/@dates/mtimes.m index d59bafa086488736830b6ef0cd7255d7d8b3fe85..1f8be8d942373840d0549e5b32145ca4550aa9d7 100644 --- a/src/@dates/mtimes.m +++ b/src/@dates/mtimes.m @@ -1,4 +1,4 @@ -function p = mtimes(o,n) % --*-- Unitary tests --*-- +function p = mtimes(o,n) % Overloads the times operator (*). Returns dates object o replicated n times. % @@ -12,7 +12,7 @@ function p = mtimes(o,n) % --*-- Unitary tests --*-- % 1. If A = dates('2000Q1'), then B=A*3 is a dates object equal to dates('2000Q1','2000Q1','2000Q1') % 2. If A = dates('2003Q1','2009Q2'), then B=A*2 is a dates object equal to dates('2003Q1','2009Q2','2003Q1','2009Q2') -% Copyright © 2013-2021 Dynare Team +% Copyright © 2013-2022 Dynare Team % % This code is free software: you can redistribute it and/or modify % it under the terms of the GNU General Public License as published by @@ -34,7 +34,7 @@ end p = copy(o); p.time = repmat(p.time, n, 1); -return +return % --*-- Unit tests --*-- %@test:1 % Define some dates diff --git a/src/@dates/ndat.m b/src/@dates/ndat.m index 83e303a684047304acc890c795289596722f83c9..c791363ddccdbfb0ca9d3c38b37c1d61d1b10044 100644 --- a/src/@dates/ndat.m +++ b/src/@dates/ndat.m @@ -1,4 +1,4 @@ -function s = ndat(o) % --*-- Unitary tests --*-- +function s = ndat(o) % Given a one element dates object, returns a string with the formatted date. % @@ -8,7 +8,7 @@ function s = ndat(o) % --*-- Unitary tests --*-- % OUTPUTS % - s [integer] -% Copyright © 2015-2021 Dynare Team +% Copyright © 2015-2022 Dynare Team % % This code is free software: you can redistribute it and/or modify % it under the terms of the GNU General Public License as published by @@ -25,7 +25,7 @@ function s = ndat(o) % --*-- Unitary tests --*-- s = length(o.time); -return +return % --*-- Unit tests --*-- %@test:1 % Define a dates object @@ -79,4 +79,4 @@ if t(1) t(2) = dassert(card,10); end T = all(t); -%@eof:3 \ No newline at end of file +%@eof:3 diff --git a/src/@dates/ne.m b/src/@dates/ne.m index 98e0777256b12e8337866a7db66e4e69d6905b8f..af27f4cd288304c6e3fbb83e407b453dfe44f2c6 100644 --- a/src/@dates/ne.m +++ b/src/@dates/ne.m @@ -1,4 +1,4 @@ -function l = ne(varargin) % --*-- Unitary tests --*-- +function l = ne(varargin) % Overloads ~= operator for dates objects. % @@ -9,7 +9,7 @@ function l = ne(varargin) % --*-- Unitary tests --*-- % OUTPUTS % - l [logical] column vector of max(n,1) elements (zeros or ones). -% Copyright © 2013-2020 Dynare Team +% Copyright © 2013-2023 Dynare Team % % This code is free software: you can redistribute it and/or modify % it under the terms of the GNU General Public License as published by @@ -28,7 +28,7 @@ function l = ne(varargin) % --*-- Unitary tests --*-- l = o.time~=p.time; -return +return % --*-- Unit tests --*-- %@test:1 % Define some dates objects diff --git a/src/@dates/plus.m b/src/@dates/plus.m index d1bc9d48a452903c92ed63fae0a4005937534eaa..6ebc3070c0afb1412dea17f93fefca02c156b266 100644 --- a/src/@dates/plus.m +++ b/src/@dates/plus.m @@ -1,4 +1,4 @@ -function q = plus(o, p) % --*-- Unitary tests --*-- +function q = plus(o, p) % Overloads the plus (+) binary operator. % @@ -14,7 +14,7 @@ function q = plus(o, p) % --*-- Unitary tests --*-- % 2. If one of the inputs is an integer or a vector of integers, the method shifts the dates % object by X (the interger input) periods forward. -% Copyright © 2013-2021 Dynare Team +% Copyright © 2013-2022 Dynare Team % % This code is free software: you can redistribute it and/or modify % it under the terms of the GNU General Public License as published by @@ -65,7 +65,7 @@ else error('dates:plus:ArgCheck','Please read the manual.') end -return +return % --*-- Unit tests --*-- %@test:1 % Define some dates objects diff --git a/src/@dates/pop.m b/src/@dates/pop.m index 3d487763696f2310e0c294f26dabf2d350052720..821af249d19b6eddd1ab8494b854c8a93daaf948 100644 --- a/src/@dates/pop.m +++ b/src/@dates/pop.m @@ -1,4 +1,4 @@ -function o = pop(o, p) % --*-- Unitary tests --*-- +function o = pop(o, p) % pop method for dates class (removes a date). % @@ -15,7 +15,7 @@ function o = pop(o, p) % --*-- Unitary tests --*-- % % See also remove, setdiff. -% Copyright © 2013-2021 Dynare Team +% Copyright © 2013-2022 Dynare Team % % This code is free software: you can redistribute it and/or modify % it under the terms of the GNU General Public License as published by @@ -38,7 +38,7 @@ else o.pop_(); end -return +return % --*-- Unit tests --*-- %@test:1 % Define some dates diff --git a/src/@dates/pop_.m b/src/@dates/pop_.m index 068ce4c150b00f146956c8af81fb0d3ba85f6858..4a359e8e926e1c3e5e7019d0c11823d4b5d33e0a 100644 --- a/src/@dates/pop_.m +++ b/src/@dates/pop_.m @@ -1,4 +1,4 @@ -function o = pop_(o, p) % --*-- Unitary tests --*-- +function o = pop_(o, p) % pop method for dates class (in place modification). % @@ -15,7 +15,7 @@ function o = pop_(o, p) % --*-- Unitary tests --*-- % % See also remove, setdiff. -% Copyright © 2013-2021 Dynare Team +% Copyright © 2013-2022 Dynare Team % % This code is free software: you can redistribute it and/or modify % it under the terms of the GNU General Public License as published by @@ -66,7 +66,7 @@ else o.time = o.time(jdx); end -return +return % --*-- Unit tests --*-- %@test:1 % Define some dates diff --git a/src/@dates/private/comparison_arg_checks.m b/src/@dates/private/comparison_arg_checks.m index 3a225aec9f126d43b2ac824e429e915402abb71c..adc7041b7683efb0c8f10a72a465a5ef95c447f0 100644 --- a/src/@dates/private/comparison_arg_checks.m +++ b/src/@dates/private/comparison_arg_checks.m @@ -1,4 +1,4 @@ -function [o, p] = comparison_arg_checks(varargin) % --*-- Unitary tests --*-- +function [o, p] = comparison_arg_checks(varargin) % Returns two dates objects or an error if objects to be compared are not compatible. % @@ -9,7 +9,7 @@ function [o, p] = comparison_arg_checks(varargin) % --*-- Unitary tests --*-- % - o [dates] dates object with n or 1 elements. % - p [dates] dates object with n or 1 elements. -% Copyright © 2014-2021 Dynare Team +% Copyright © 2014-2023 Dynare Team % % This code is free software: you can redistribute it and/or modify % it under the terms of the GNU General Public License as published by @@ -49,7 +49,7 @@ end o = varargin{1}; p = varargin{2}; -return +return % --*-- Unit tests --*-- %@test:1 OPATH = pwd(); @@ -166,4 +166,4 @@ end T = all(t); cd(OPATH); -%@eof:7 \ No newline at end of file +%@eof:7 diff --git a/src/@dates/private/dates4display.m b/src/@dates/private/dates4display.m index 1a7ccd5b1e81b8b020988d9cddaba9d650799465..12df3e83e30e60031b7198d930895fb259b2ac72 100644 --- a/src/@dates/private/dates4display.m +++ b/src/@dates/private/dates4display.m @@ -1,4 +1,4 @@ -function str = dates4display(o, name, max_number_of_elements) % --*-- Unitary tests --*-- +function str = dates4display(o, name, max_number_of_elements) % Converts a list object to a string. % @@ -10,7 +10,7 @@ function str = dates4display(o, name, max_number_of_elements) % --*-- Unitary te % OUTPUTS % - str [string] Representation of the dates object as a string. -% Copyright © 2014-2021 Dynare Team +% Copyright © 2014-2023 Dynare Team % % This code is free software: you can redistribute it and/or modify % it under the terms of the GNU General Public License as published by @@ -47,106 +47,108 @@ else end str = sprintf('%s%s>\n', str, date2string(o.time(o.length()), o.freq)); +return % --*-- Unit tests --*-- + %@test:1 -%$ OPATH = pwd(); -%$ DSERIES_PATH = strrep(which('initialize_dseries_class'),'/initialize_dseries_class.m',''); -%$ cd([DSERIES_PATH '/@dates/private']); -%$ -%$ try -%$ toto = dates(); -%$ str = dates4display(toto, 'toto', 5); -%$ t(1) = true; -%$ catch -%$ t(1) = false; -%$ end -%$ -%$ if t(1) -%$ expected_str_1 = sprintf('toto is an empty dates object.\\n'); -%$ try -%$ t(2) = dassert(str, expected_str_1); -%$ catch -%$ t(2) = false; -%$ end -%$ end -%$ -%$ T = all(t); -%$ cd(OPATH); +OPATH = pwd(); +DSERIES_PATH = strrep(which('initialize_dseries_class'),'/initialize_dseries_class.m',''); +cd([DSERIES_PATH '/@dates/private']); + +try + toto = dates(); + str = dates4display(toto, 'toto', 5); + t(1) = true; +catch + t(1) = false; +end + +if t(1) + expected_str_1 = sprintf('toto is an empty dates object.\\n'); + try + t(2) = dassert(str, expected_str_1); + catch + t(2) = false; + end +end + +T = all(t); +cd(OPATH); %@eof:1 %@test:2 -%$ OPATH = pwd(); -%$ DSERIES_PATH = strrep(which('initialize_dseries_class'),'/initialize_dseries_class.m',''); -%$ cd([DSERIES_PATH '/@dates/private']); -%$ -%$ try -%$ toto = dates('1950Q1'):dates('1950Q2'); -%$ str = dates4display(toto, 'toto', 5); -%$ t(1) = true; -%$ catch -%$ t(1) = false; -%$ end -%$ -%$ if t(1) -%$ expected_str_2 = sprintf('toto = <dates: 1950Q1, 1950Q2>\\n'); -%$ try -%$ t(2) = dassert(str, expected_str_2); -%$ catch -%$ t(2) = false; -%$ end -%$ end -%$ -%$ T = all(t); -%$ cd(OPATH); +OPATH = pwd(); +DSERIES_PATH = strrep(which('initialize_dseries_class'),'/initialize_dseries_class.m',''); +cd([DSERIES_PATH '/@dates/private']); + +try + toto = dates('1950Q1'):dates('1950Q2'); + str = dates4display(toto, 'toto', 5); + t(1) = true; +catch + t(1) = false; +end + +if t(1) + expected_str_2 = sprintf('toto = <dates: 1950Q1, 1950Q2>\\n'); + try + t(2) = dassert(str, expected_str_2); + catch + t(2) = false; + end +end + +T = all(t); +cd(OPATH); %@eof:2 %@test:3 -%$ OPATH = pwd(); -%$ DSERIES_PATH = strrep(which('initialize_dseries_class'),'/initialize_dseries_class.m',''); -%$ cd([DSERIES_PATH '/@dates/private']); -%$ -%$ try -%$ toto = dates('1950Q1'):dates('1951Q1'); -%$ str = dates4display(toto, 'toto', 4); -%$ t(1) = true; -%$ catch -%$ t(1) = false; -%$ end -%$ -%$ if t(1) -%$ expected_str_3 = sprintf('toto = <dates: 1950Q1, 1950Q2, ..., 1950Q4, 1951Q1>\\n'); -%$ try -%$ t(2) = dassert(str, expected_str_3); -%$ catch -%$ t(2) = false; -%$ end -%$ end -%$ -%$ T = all(t); -%$ cd(OPATH); +OPATH = pwd(); +DSERIES_PATH = strrep(which('initialize_dseries_class'),'/initialize_dseries_class.m',''); +cd([DSERIES_PATH '/@dates/private']); + +try + toto = dates('1950Q1'):dates('1951Q1'); + str = dates4display(toto, 'toto', 4); + t(1) = true; +catch + t(1) = false; +end + +if t(1) + expected_str_3 = sprintf('toto = <dates: 1950Q1, 1950Q2, ..., 1950Q4, 1951Q1>\\n'); + try + t(2) = dassert(str, expected_str_3); + catch + t(2) = false; + end +end + +T = all(t); +cd(OPATH); %@eof:3 %@test:4 -%$ OPATH = pwd(); -%$ DSERIES_PATH = strrep(which('initialize_dseries_class'),'/initialize_dseries_class.m',''); -%$ cd([DSERIES_PATH '/@dates/private']); -%$ -%$ try -%$ toto = dates('1950Q1'):dates('1951Q1'); -%$ str = dates4display(toto, 'toto', 6); -%$ t(1) = true; -%$ catch -%$ t(1) = false; -%$ end -%$ -%$ if t(1) -%$ expected_str_4 = sprintf('toto = <dates: 1950Q1, 1950Q2, 1950Q3, 1950Q4, 1951Q1>\\n'); -%$ try -%$ t(2) = dassert(str, expected_str_4); -%$ catch -%$ t(2) = false; -%$ end -%$ end -%$ -%$ T = all(t); -%$ cd(OPATH); +OPATH = pwd(); +DSERIES_PATH = strrep(which('initialize_dseries_class'),'/initialize_dseries_class.m',''); +cd([DSERIES_PATH '/@dates/private']); + +try + toto = dates('1950Q1'):dates('1951Q1'); + str = dates4display(toto, 'toto', 6); + t(1) = true; +catch + t(1) = false; +end + +if t(1) + expected_str_4 = sprintf('toto = <dates: 1950Q1, 1950Q2, 1950Q3, 1950Q4, 1951Q1>\\n'); + try + t(2) = dassert(str, expected_str_4); + catch + t(2) = false; + end +end + +T = all(t); +cd(OPATH); %@eof:4 diff --git a/src/@dates/remove.m b/src/@dates/remove.m index cb6aadb750fc6497ea3639684d09305c4164792c..dc67fbe30d072a25c58433edd8a06ad3106e1846 100644 --- a/src/@dates/remove.m +++ b/src/@dates/remove.m @@ -1,4 +1,4 @@ -function o = remove(o, p) % --*-- Unitary tests --*-- +function o = remove(o, p) % remove method for dates class (removes dates). % @@ -15,7 +15,7 @@ function o = remove(o, p) % --*-- Unitary tests --*-- % % See also pop, setdiff -% Copyright © 2013-2021 Dynare Team +% Copyright © 2013-2022 Dynare Team % % This code is free software: you can redistribute it and/or modify % it under the terms of the GNU General Public License as published by @@ -45,7 +45,7 @@ end o = copy(o); o.remove_(p); -return +return % --*-- Unit tests --*-- %@test:1 % Define some dates objects diff --git a/src/@dates/remove_.m b/src/@dates/remove_.m index 8e4c5305d6ae3f47363ff8daa964afb71d56f51e..c938325ae481b2b59552afccad282ffb5e07f6a1 100644 --- a/src/@dates/remove_.m +++ b/src/@dates/remove_.m @@ -1,4 +1,4 @@ -function o = remove_(o, p) % --*-- Unitary tests --*-- +function o = remove_(o, p) % remove method for dates class (removes dates). % @@ -15,7 +15,7 @@ function o = remove_(o, p) % --*-- Unitary tests --*-- % % See also pop, setdiff -% Copyright © 2013-2021 Dynare Team +% Copyright © 2013-2022 Dynare Team % % This code is free software: you can redistribute it and/or modify % it under the terms of the GNU General Public License as published by @@ -46,7 +46,7 @@ time = setdiff(o.time, p.time, 'legacy'); o.time = time; -return +return % --*-- Unit tests --*-- %@test:1 % Define some dates objects diff --git a/src/@dates/setdiff.m b/src/@dates/setdiff.m index 2856ede92b3b4dd3399981b65cf0197a49b79600..4f0462edcebe4375c6ef6c158770dd6f04768f0e 100644 --- a/src/@dates/setdiff.m +++ b/src/@dates/setdiff.m @@ -1,4 +1,4 @@ -function [q, io] = setdiff(o, p) % --*-- Unitary tests --*-- +function [q, io] = setdiff(o, p) % Overloads setdiff function for dates objects. % @@ -12,7 +12,7 @@ function [q, io] = setdiff(o, p) % --*-- Unitary tests --*-- % % See also pop, remove. -% Copyright © 2013-2021 Dynare Team +% Copyright © 2013-2022 Dynare Team % % This code is free software: you can redistribute it and/or modify % it under the terms of the GNU General Public License as published by @@ -57,7 +57,7 @@ end q = dates(o.freq); q.time = time; -return +return % --*-- Unit tests --*-- %@test:1 % Define some dates objects diff --git a/src/@dates/sort.m b/src/@dates/sort.m index 1b8f231bc3944be64913df0077b6c32b2ad92d67..0b153641f93d077825e1569196da53913fef38b4 100644 --- a/src/@dates/sort.m +++ b/src/@dates/sort.m @@ -1,4 +1,4 @@ -function o = sort(o) % --*-- Unitary tests --*-- +function o = sort(o) % Sort method for dates class (with copy). % @@ -8,7 +8,7 @@ function o = sort(o) % --*-- Unitary tests --*-- % OUTPUTS % - o [dates] with dates sorted by increasing order. -% Copyright © 2011-2021 Dynare Team +% Copyright © 2011-2022 Dynare Team % % This code is free software: you can redistribute it and/or modify % it under the terms of the GNU General Public License as published by @@ -26,7 +26,7 @@ function o = sort(o) % --*-- Unitary tests --*-- o = copy(o); o.sort_(); -return +return % --*-- Unit tests --*-- %@test:1 % Define some dates diff --git a/src/@dates/sort_.m b/src/@dates/sort_.m index 25e49cff558b2ac67d79868e0713a52dd7290975..c66be8132496d9a485aa5a69f3baa9e2736a158b 100644 --- a/src/@dates/sort_.m +++ b/src/@dates/sort_.m @@ -1,4 +1,4 @@ -function o = sort_(o) % --*-- Unitary tests --*-- +function o = sort_(o) % Sort method for dates class (in place modification). % @@ -8,7 +8,7 @@ function o = sort_(o) % --*-- Unitary tests --*-- % OUTPUTS % - o [dates] with dates sorted by increasing order. -% Copyright © 2015-2021 Dynare Team +% Copyright © 2015-2023 Dynare Team % % This code is free software: you can redistribute it and/or modify % it under the terms of the GNU General Public License as published by @@ -29,7 +29,7 @@ end o.time = sort(o.time); -return +return % --*-- Unit tests --*-- %@test:1 % Define some dates @@ -101,4 +101,4 @@ if t(1) t(2) = isequal(d,dates('1999-01-02', '2000-01-01', '2001-01-01')); end T = all(t); -%@eof:3 \ No newline at end of file +%@eof:3 diff --git a/src/@dates/strings.m b/src/@dates/strings.m index 6d3a2d7c24ea299b261351c24e043182f023d4df..b58581937cabe9287f5efd63d4031d42aee6fc56 100644 --- a/src/@dates/strings.m +++ b/src/@dates/strings.m @@ -1,4 +1,4 @@ -function m = strings(o) % --*-- Unitary tests --*-- +function m = strings(o) % Returns a cell array of strings containing the dates % @@ -8,7 +8,7 @@ function m = strings(o) % --*-- Unitary tests --*-- % OUTPUTS % - m [cell of char] object with n elements. -% Copyright © 2013-2021 Dynare Team +% Copyright © 2013-2022 Dynare Team % % This code is free software: you can redistribute it and/or modify % it under the terms of the GNU General Public License as published by @@ -29,7 +29,7 @@ for i = 1:o.length() m(i) = { date2string(o.time(i), o.freq) }; end -return +return % --*-- Unit tests --*-- %@test:1 % Define a dates objects diff --git a/src/@dates/subsasgn.m b/src/@dates/subsasgn.m index e3b19539b2b592dc5f585eedfff592cc23e670ab..e2f4ac1e0be87aab842cec39aaa4eb86a8807e51 100644 --- a/src/@dates/subsasgn.m +++ b/src/@dates/subsasgn.m @@ -1,6 +1,6 @@ -function val = subsasgn(val, idx, rhs) % --*-- Unitary tests --*-- +function val = subsasgn(val, idx, rhs) -% Copyright © 2013-2021 Dynare Team +% Copyright © 2013-2023 Dynare Team % % This code is free software: you can redistribute it and/or modify % it under the terms of the GNU General Public License as published by @@ -17,7 +17,7 @@ function val = subsasgn(val, idx, rhs) % --*-- Unitary tests --*-- error('dates::subsasgn: Members of dates class are private') -return +return % --*-- Unit tests --*-- %@test:1 % Define a dates objects @@ -32,4 +32,4 @@ catch end T = all(t); -%@eof:1 \ No newline at end of file +%@eof:1 diff --git a/src/@dates/subsref.m b/src/@dates/subsref.m index 9b6714425d75b0f92cfc64f07bb1dded5318b93c..eb966959da1faa1740ad568aabc7a9c0014d6f3f 100644 --- a/src/@dates/subsref.m +++ b/src/@dates/subsref.m @@ -1,4 +1,4 @@ -function B = subsref(A,S) % --*-- Unitary tests --*-- +function B = subsref(A,S) % Overloads the subsref method for dates objects. % @@ -13,7 +13,7 @@ function B = subsref(A,S) % --*-- Unitary tests --*-- % 1. The type of the returned argument depends on the content of S. % 2. See the matlab's documentation about the subsref method. -% Copyright © 2011-2021 Dynare Team +% Copyright © 2011-2023 Dynare Team % % This code is free software: you can redistribute it and/or modify % it under the terms of the GNU General Public License as published by @@ -256,7 +256,7 @@ if ~isempty(S) B = subsref(B, S); end -return +return % --*-- Unit tests --*-- %@test:1 % Define a dates object @@ -465,4 +465,4 @@ if t(1) t(4) = isequal(d.ndat(),1); end T = all(t); -%@eof:9 \ No newline at end of file +%@eof:9 diff --git a/src/@dates/uminus.m b/src/@dates/uminus.m index 6d20b3bb3815d2f253e7514b5fb09bc1effc3611..814d8370ca186a8bfe0fc42b8038995d12666ccc 100644 --- a/src/@dates/uminus.m +++ b/src/@dates/uminus.m @@ -1,4 +1,4 @@ -function o = uminus(o) % --*-- Unitary tests --*-- +function o = uminus(o) % Overloads the unary minus operator for dates objects. Shifts all the elements by one period. % @@ -8,7 +8,7 @@ function o = uminus(o) % --*-- Unitary tests --*-- % OUTPUTS % - o [dates] -% Copyright © 2013-2021 Dynare Team +% Copyright © 2013-2022 Dynare Team % % This code is free software: you can redistribute it and/or modify % it under the terms of the GNU General Public License as published by @@ -25,7 +25,7 @@ function o = uminus(o) % --*-- Unitary tests --*-- o.time(:) = o.time(:)-1; -return +return % --*-- Unit tests --*-- %@test:1 % Define some dates @@ -89,4 +89,4 @@ if t(1) end T = all(t); -%@eof:3 \ No newline at end of file +%@eof:3 diff --git a/src/@dates/union.m b/src/@dates/union.m index 523f9899dd3967ba304e2ce6cee61a1f319b9a44..93c162d73e9ffe5f32697f34ef926704aa05033b 100644 --- a/src/@dates/union.m +++ b/src/@dates/union.m @@ -1,4 +1,4 @@ -function o = union(varargin) % --*-- Unitary tests --*-- +function o = union(varargin) % Overloads union function for dates objects (removes repetitions if any). % @@ -11,7 +11,7 @@ function o = union(varargin) % --*-- Unitary tests --*-- % REMARKS % 1. Elements in o are sorted by increasing order. -% Copyright © 2013-2021 Dynare Team +% Copyright © 2013-2023 Dynare Team % % This code is free software: you can redistribute it and/or modify % it under the terms of the GNU General Public License as published by @@ -32,12 +32,12 @@ end if isequal(nargin, 1) o = sort(unique(varargin{1})); - return; + return end o = sort(unique(horzcat(varargin{:}))); -return +return % --*-- Unit tests --*-- %@test:1 % Define some dates objects @@ -75,4 +75,4 @@ e2 = union(d1,d2); t(1) = isequal(e1, d1); t(2) = isequal(e2, d3); T = all(t); -%@eof:1 \ No newline at end of file +%@eof:1 diff --git a/src/@dates/unique.m b/src/@dates/unique.m index 338865cbdbfca918aba4f21cba68393c896612c1..ecdbc79d40e457fe71db77c12fcf92fb0ae0d1bf 100644 --- a/src/@dates/unique.m +++ b/src/@dates/unique.m @@ -1,4 +1,4 @@ -function o = unique(o) % --*-- Unitary tests --*-- +function o = unique(o) % Overloads the unique function for dates objects. % @@ -11,7 +11,7 @@ function o = unique(o) % --*-- Unitary tests --*-- % REMARKS % 1. Only the last occurence of a date is kept. -% Copyright © 2013-2021 Dynare Team +% Copyright © 2013-2022 Dynare Team % % This code is free software: you can redistribute it and/or modify % it under the terms of the GNU General Public License as published by @@ -33,7 +33,7 @@ end o = copy(o); o.unique_(); -return +return % --*-- Unit tests --*-- %@test:1 % Define some dates @@ -141,4 +141,4 @@ if t(1) t(2) = isequal(d2, dates('2000-01-02', '2000-01-01')); end T = all(t); -%@eof:4 \ No newline at end of file +%@eof:4 diff --git a/src/@dates/unique_.m b/src/@dates/unique_.m index 60d031a02d8a981445347eaf4166bff2a9c06874..7d598262b6c827235bfb6f9cef7f371075e9b111 100644 --- a/src/@dates/unique_.m +++ b/src/@dates/unique_.m @@ -1,4 +1,4 @@ -function o = unique_(o) % --*-- Unitary tests --*-- +function o = unique_(o) % Overloads the unique function for dates objects (in place modification). % @@ -11,7 +11,7 @@ function o = unique_(o) % --*-- Unitary tests --*-- % REMARKS % 1. Only the last occurence of a date is kept. -% Copyright © 2013-2021 Dynare Team +% Copyright © 2013-2022 Dynare Team % % This code is free software: you can redistribute it and/or modify % it under the terms of the GNU General Public License as published by @@ -34,7 +34,7 @@ end o.time = o.time(sort(id)); -return +return % --*-- Unit tests --*-- %@test:1 % Define some dates diff --git a/src/@dates/uplus.m b/src/@dates/uplus.m index 15b3a140ab5855611329b5e022db6e6adf9b8bd7..d04569f71cde6358e739fa5355130ccd19e425c6 100644 --- a/src/@dates/uplus.m +++ b/src/@dates/uplus.m @@ -1,4 +1,4 @@ -function o = uplus(o) % --*-- Unitary tests --*-- +function o = uplus(o) % Overloads the unary plus operator for dates objects. Shifts all the elements by one period. % @@ -8,7 +8,7 @@ function o = uplus(o) % --*-- Unitary tests --*-- % OUTPUTS % - o [dates] -% Copyright © 2013-2021 Dynare Team +% Copyright © 2013-2023 Dynare Team % % This code is free software: you can redistribute it and/or modify % it under the terms of the GNU General Public License as published by @@ -25,7 +25,7 @@ function o = uplus(o) % --*-- Unitary tests --*-- o.time = o.time+1; -return +return % --*-- Unit tests --*-- %@test:1 % Define some dates @@ -90,4 +90,4 @@ if t(1) end T = all(t); -%@eof:3 \ No newline at end of file +%@eof:3 diff --git a/src/@dates/vertcat.m b/src/@dates/vertcat.m index aa381dea23404b905a75aed43c77e4576af6d46e..761fd55bc425d35515a20226210030984f3fba8f 100644 --- a/src/@dates/vertcat.m +++ b/src/@dates/vertcat.m @@ -1,4 +1,4 @@ -function o = vertcat(varargin) % --*-- Unitary tests --*-- +function o = vertcat(varargin) % Overloads the vertcat method for dates objects. % @@ -15,7 +15,7 @@ function o = vertcat(varargin) % --*-- Unitary tests --*-- % % Defines a dates object D containing the dates appearing in A, B and C. -% Copyright © 2013-2021 Dynare Team +% Copyright © 2013-2022 Dynare Team % % This code is free software: you can redistribute it and/or modify % it under the terms of the GNU General Public License as published by @@ -36,7 +36,7 @@ end o = horzcat(varargin{:}); -return +return % --*-- Unit tests --*-- %@test:1 % Define some dates diff --git a/src/@dates/year.m b/src/@dates/year.m index 657033ec6ee14b65930bd6c10f4a7d192b58703b..77bce3fb1ce100ad4047408824f2a3f47ea2466f 100644 --- a/src/@dates/year.m +++ b/src/@dates/year.m @@ -1,8 +1,8 @@ -function y = year(d) % --*-- Unitary tests --*-- +function y = year(d) % Returns the year. -% Copyright © 2016-2021 Dynare Team +% Copyright © 2016-2022 Dynare Team % % This code is free software: you can redistribute it and/or modify % it under the terms of the GNU General Public License as published by @@ -29,7 +29,7 @@ else y = d.time; end -return +return % --*-- Unit tests --*-- %@test:1 try diff --git a/src/@dseries/abs.m b/src/@dseries/abs.m index e9cc534cb812e2b51a1e5c411f811877ca7d9101..29f8bd9b66c5037dcf9b6a33252d55124c459c1d 100644 --- a/src/@dseries/abs.m +++ b/src/@dseries/abs.m @@ -1,4 +1,4 @@ -function o = abs(o) % --*-- Unitary tests --*-- +function o = abs(o) % Apply the absolute value to all the variables in a dseries object (without in place modification). % @@ -8,7 +8,7 @@ function o = abs(o) % --*-- Unitary tests --*-- % OUTPUTS % - o [dseries] -% Copyright © 2011-2021 Dynare Team +% Copyright © 2011-2023 Dynare Team % % This file is part of Dynare. % @@ -28,7 +28,7 @@ function o = abs(o) % --*-- Unitary tests --*-- o = copy(o); o.abs_; -return +return % --*-- Unit tests --*-- %@test:1 % Define a dates object diff --git a/src/@dseries/abs_.m b/src/@dseries/abs_.m index e0ab59cbf5fbbdb13184a619aab85db98a69c8a4..592c1facd3f322b65861e87a7c6a72952140214f 100644 --- a/src/@dseries/abs_.m +++ b/src/@dseries/abs_.m @@ -1,4 +1,4 @@ -function o = abs_(o) % --*-- Unitary tests --*-- +function o = abs_(o) % Apply the absolute value to all the variables in a dseries object (in place modification). % @@ -8,7 +8,7 @@ function o = abs_(o) % --*-- Unitary tests --*-- % OUTPUTS % - o [dseries] -% Copyright © 2017-2021 Dynare Team +% Copyright © 2017-2023 Dynare Team % % This file is part of Dynare. % @@ -35,7 +35,7 @@ end o.data = abs(o.data); -return +return % --*-- Unit tests --*-- %@test:1 % Define a dates object @@ -99,4 +99,4 @@ if t(1) end T = all(t); -%@eof:2 \ No newline at end of file +%@eof:2 diff --git a/src/@dseries/align.m b/src/@dseries/align.m index ec4ca1c5f75d64cf0cf958282af4340ebffb4805..3b17c2c8ed9c69a5ae2ac9f3375b2dadd5bf1a73 100644 --- a/src/@dseries/align.m +++ b/src/@dseries/align.m @@ -1,4 +1,4 @@ -function [o, p] = align(o, p) % --*-- Unitary tests --*-- +function [o, p] = align(o, p) % If necessay completes dseries object o and p so that they are defined on the same time range % (in place modification). @@ -11,7 +11,7 @@ function [o, p] = align(o, p) % --*-- Unitary tests --*-- % - o [dseries] % - p [dseries] -% Copyright © 2013-2021 Dynare Team +% Copyright © 2013-2023 Dynare Team % % This file is part of Dynare. % @@ -32,7 +32,7 @@ o = copy(o); p = copy(p); align_(o, p); -return +return % --*-- Unit tests --*-- %@test:1 % Define a datasets. @@ -128,4 +128,4 @@ if t(1) t(5) = dassert(ts2.data,[B; NaN(1,2)], 1e-15); end T = all(t); -%@eof:3 \ No newline at end of file +%@eof:3 diff --git a/src/@dseries/align_.m b/src/@dseries/align_.m index 3fea71dbacebf424acdeb172d997b4a9735a1c84..7e19c43e05ecaff6c801dca843dd7ad5a4e3d938 100644 --- a/src/@dseries/align_.m +++ b/src/@dseries/align_.m @@ -1,4 +1,4 @@ -function [o, p] = align_(o, p) % --*-- Unitary tests --*-- +function [o, p] = align_(o, p) % If necessay completes dseries object o and p so that they are defined on the same time range % (in place modification). @@ -11,7 +11,7 @@ function [o, p] = align_(o, p) % --*-- Unitary tests --*-- % - o [dseries] % - p [dseries] -% Copyright © 2013-2021 Dynare Team +% Copyright © 2013-2023 Dynare Team % % This file is part of Dynare. % @@ -62,7 +62,7 @@ end o.dates = init:init+(nobs(o)-1); p.dates = init:init+(nobs(p)-1); -return +return % --*-- Unit tests --*-- %@test:1 % Define a datasets. @@ -161,4 +161,4 @@ if t(1) t(6) = dassert(ts1.dates, ts2.dates); end T = all(t); -%@eof:3 \ No newline at end of file +%@eof:3 diff --git a/src/@dseries/backcast.m b/src/@dseries/backcast.m index 62ca613a490210b22d66a2a8176d1e0cfb144862..99d588b3f086339c4998863b161f54a9c8913384 100644 --- a/src/@dseries/backcast.m +++ b/src/@dseries/backcast.m @@ -1,4 +1,4 @@ -function q = backcast(o, p, diff) % --*-- Unitary tests --*-- +function q = backcast(o, p, diff) % Chains two dseries objects. % @@ -13,7 +13,7 @@ function q = backcast(o, p, diff) % --*-- Unitary tests --*-- % The two dseries objects must have common frequency and the same number of variables. Also the % two samples must overlap. -% Copyright © 2019-2020 Dynare Team +% Copyright © 2019-2023 Dynare Team % % This file is part of Dynare. % @@ -38,7 +38,7 @@ else q.backcast_(p); end -return +return % --*-- Unit tests --*-- %@test:1 y = ones(10,1); @@ -66,4 +66,4 @@ return end T = all(t); -%@eof:1 \ No newline at end of file +%@eof:1 diff --git a/src/@dseries/backcast_.m b/src/@dseries/backcast_.m index 10be86a8675300ebcd603f42411c950b505a97b2..352843f35844894c664bb8c0fc13009077aced37 100644 --- a/src/@dseries/backcast_.m +++ b/src/@dseries/backcast_.m @@ -1,6 +1,6 @@ -function o = backcast_(o, p, diff) % --*-- Unitary tests --*-- +function o = backcast_(o, p, diff) -% Copyright © 2019-2020 Dynare Team +% Copyright © 2019-2023 Dynare Team % % This file is part of Dynare. % @@ -65,7 +65,7 @@ for i=1:o.vobs end end -return +return % --*-- Unit tests --*-- %@test:1 y = ones(10,1); @@ -121,4 +121,4 @@ return end T = all(t); -%@eof:2 \ No newline at end of file +%@eof:2 diff --git a/src/@dseries/baxter_king_filter.m b/src/@dseries/baxter_king_filter.m index fb0107646a8bb01ec64fcb87a449d9eaf718edd9..610585f16ebb8194610135d4cc363fccc8f668f2 100644 --- a/src/@dseries/baxter_king_filter.m +++ b/src/@dseries/baxter_king_filter.m @@ -1,4 +1,4 @@ -function o = baxter_king_filter(o, high_frequency, low_frequency, K) % --*-- Unitary tests --*-- +function o = baxter_king_filter(o, high_frequency, low_frequency, K) % Implementation of Baxter and King (1999) band pass filter for dseries objects. The code is adapted from % the one provided by Baxter and King. This filter isolates business cycle fluctuations with a period of length @@ -17,7 +17,7 @@ function o = baxter_king_filter(o, high_frequency, low_frequency, K) % --*-- Uni % This filter use a (symmetric) moving average smoother, so that K observations at the beginning and at the end of the % sample are lost in the computation of the filter. -% Copyright © 2013-2021 Dynare Team +% Copyright © 2013-2023 Dynare Team % % This file is part of Dynare. % @@ -59,7 +59,7 @@ end o = copy(o); o.baxter_king_filter_(high_frequency, low_frequency, K); -return +return % --*-- Unit tests --*-- %@test:1 plot_flag = false; diff --git a/src/@dseries/baxter_king_filter_.m b/src/@dseries/baxter_king_filter_.m index b4f52b4a13b801bf0e8ee6800faafe77922188dc..068422451ec677c403fcdb3ceeb1bf2ed39fa5dc 100644 --- a/src/@dseries/baxter_king_filter_.m +++ b/src/@dseries/baxter_king_filter_.m @@ -1,4 +1,4 @@ -function o = baxter_king_filter_(o, high_frequency, low_frequency, K) % --*-- Unitary tests --*-- +function o = baxter_king_filter_(o, high_frequency, low_frequency, K) % Implementation of Baxter and King (1999) band pass filter for dseries objects. The code is adapted from % the one provided by Baxter and King. This filter isolates business cycle fluctuations with a period of length @@ -17,7 +17,7 @@ function o = baxter_king_filter_(o, high_frequency, low_frequency, K) % --*-- Un % This filter use a (symmetric) moving average smoother, so that K observations at the beginning and at the end of the % sample are lost in the computation of the filter. -% Copyright © 2013-2021 Dynare Team +% Copyright © 2013-2023 Dynare Team % % This file is part of Dynare. % @@ -109,7 +109,7 @@ for i=1:vobs(o) end end -return +return % --*-- Unit tests --*-- %@test:1 plot_flag = false; diff --git a/src/@dseries/center.m b/src/@dseries/center.m index 317a709e1399a8e658cabe8392f54ae52a21de8f..f796e200f1e22c71233c4f00928c601812da5b0d 100644 --- a/src/@dseries/center.m +++ b/src/@dseries/center.m @@ -1,4 +1,4 @@ -function o = center(o, geometric) % --*-- Unitary tests --*-- +function o = center(o, geometric) % Centers dseries object o around its mean (arithmetic or geometric). % @@ -9,7 +9,7 @@ function o = center(o, geometric) % --*-- Unitary tests --*-- % OUTPUTS % - o dseries object. -% Copyright © 2016-2021 Dynare Team +% Copyright © 2016-2023 Dynare Team % % This file is part of Dynare. % @@ -33,7 +33,7 @@ end o = copy(o); o.center_(geometric); -return +return % --*-- Unit tests --*-- %@test:1 % Define a dataset. diff --git a/src/@dseries/center_.m b/src/@dseries/center_.m index cc4f130b92f41795f2fcac463db17bf3718868a5..c8d1602f508862292dc15be4812880b08489193f 100644 --- a/src/@dseries/center_.m +++ b/src/@dseries/center_.m @@ -1,4 +1,4 @@ -function o = center_(o, geometric) % --*-- Unitary tests --*-- +function o = center_(o, geometric) % Centers dseries object o around its mean (arithmetic or geometric). % @@ -9,7 +9,7 @@ function o = center_(o, geometric) % --*-- Unitary tests --*-- % OUTPUTS % - o dseries object. -% Copyright © 2016-2021 Dynare Team +% Copyright © 2016-2023 Dynare Team % % This file is part of Dynare. % @@ -46,7 +46,7 @@ for i=1:o.vobs end end -return +return % --*-- Unit tests --*-- %@test:1 % Define a dataset. diff --git a/src/@dseries/chain.m b/src/@dseries/chain.m index e07009e3f894de45fc3ba9f23118363aab6a974f..7a42c068413e46c5e71158cf202fbf030b5790c6 100644 --- a/src/@dseries/chain.m +++ b/src/@dseries/chain.m @@ -1,4 +1,4 @@ -function q = chain(o, p) % --*-- Unitary tests --*-- +function q = chain(o, p) % Chains two dseries objects. % @@ -13,7 +13,7 @@ function q = chain(o, p) % --*-- Unitary tests --*-- % The two dseries objects must have common frequency and the same number of variables. Also the % two samples must overlap. -% Copyright © 2014-2021 Dynare Team +% Copyright © 2014-2023 Dynare Team % % This file is part of Dynare. % @@ -33,7 +33,7 @@ function q = chain(o, p) % --*-- Unitary tests --*-- q = copy(o); q.chain_(p); -return +return % --*-- Unit tests --*-- %@test:1 try @@ -57,4 +57,4 @@ if t(1) end T = all(t); -%@eof:1 \ No newline at end of file +%@eof:1 diff --git a/src/@dseries/chain_.m b/src/@dseries/chain_.m index d34c18b776f9cb614cb6b22d329f3bc1882b72ba..b6cec5bae496811e47881eb3355b616d625cdbe9 100644 --- a/src/@dseries/chain_.m +++ b/src/@dseries/chain_.m @@ -1,6 +1,6 @@ -function o = chain_(o, p) % --*-- Unitary tests --*-- +function o = chain_(o, p) -% Copyright © 2014-2021 Dynare Team +% Copyright © 2014-2023 Dynare Team % % This file is part of Dynare. % @@ -77,7 +77,7 @@ for i=1:o.vobs end end -return +return % --*-- Unit tests --*-- %@test:1 try @@ -124,4 +124,4 @@ if t(1) end T = all(t); -%@eof:2 \ No newline at end of file +%@eof:2 diff --git a/src/@dseries/copy.m b/src/@dseries/copy.m index 92e3127e941a9b75e47cdadb3ff9a2d4c08b8c3b..f8488a528ef517a29a6d64195737d8beeeac72fe 100644 --- a/src/@dseries/copy.m +++ b/src/@dseries/copy.m @@ -1,4 +1,4 @@ -function p = copy(o) % --*-- Unitary tests --*-- +function p = copy(o) % Do a copy of a dseries object. % @@ -8,7 +8,7 @@ function p = copy(o) % --*-- Unitary tests --*-- % OUTPUTS % - p [dates] -% Copyright © 2015-2021 Dynare Team +% Copyright © 2015-2023 Dynare Team % % This code is free software: you can redistribute it and/or modify % it under the terms of the GNU General Public License as published by @@ -31,7 +31,7 @@ p.dates = o.dates; p.ops = o.ops; p.tags = o.tags; -return +return % --*-- Unit tests --*-- %@test:1 % Define a dates object @@ -53,4 +53,4 @@ if t(1) end T = all(t); -%@eof:1 \ No newline at end of file +%@eof:1 diff --git a/src/@dseries/cumprod.m b/src/@dseries/cumprod.m index 936505450a2f79e65ae41a28c0891117a30908af..a1f9219317a4e444dac11ae56425024195558cdf 100644 --- a/src/@dseries/cumprod.m +++ b/src/@dseries/cumprod.m @@ -1,4 +1,4 @@ -function o = cumprod(varargin) % --*-- Unitary tests --*-- +function o = cumprod(varargin) % Overloads matlab's cumprod function for dseries objects. % @@ -10,7 +10,7 @@ function o = cumprod(varargin) % --*-- Unitary tests --*-- % OUTPUTS % - B dseries object. -% Copyright © 2014-2021 Dynare Team +% Copyright © 2014-2023 Dynare Team % % This file is part of Dynare. % @@ -39,7 +39,7 @@ else end end -return +return % --*-- Unit tests --*-- %@test:1 % Define a data set. diff --git a/src/@dseries/cumprod_.m b/src/@dseries/cumprod_.m index c2ce917d77c06896e81af2d041b27d0069439681..e2e5ae3f32724894e48ccae1330a598537489c25 100644 --- a/src/@dseries/cumprod_.m +++ b/src/@dseries/cumprod_.m @@ -1,4 +1,4 @@ -function o = cumprod_(varargin) % --*-- Unitary tests --*-- +function o = cumprod_(varargin) % Overloads matlab's cumprod function for dseries objects. % @@ -10,7 +10,7 @@ function o = cumprod_(varargin) % --*-- Unitary tests --*-- % OUTPUTS % - o dseries object. -% Copyright © 2014-2021 Dynare Team +% Copyright © 2014-2023 Dynare Team % % This file is part of Dynare. % @@ -128,7 +128,7 @@ switch nargin error('dseries::cumprod: Wrong number of input arguments!') end -return +return % --*-- Unit tests --*-- %@test:1 % Define a data set. @@ -291,4 +291,4 @@ if t(1) t(2) = dassert(ts0.data, A); end T = all(t); -%@eof:6 \ No newline at end of file +%@eof:6 diff --git a/src/@dseries/cumsum.m b/src/@dseries/cumsum.m index 14f06913f9f204a3184e5de85c0cc968805753d0..d1575af84a7072cae100b2937d02552962f69aec 100644 --- a/src/@dseries/cumsum.m +++ b/src/@dseries/cumsum.m @@ -1,4 +1,4 @@ -function o = cumsum(varargin) % --*-- Unitary tests --*-- +function o = cumsum(varargin) % Overloads matlab's cumsum function for dseries objects. % @@ -10,7 +10,7 @@ function o = cumsum(varargin) % --*-- Unitary tests --*-- % OUTPUTS % - o dseries object. -% Copyright © 2013-2021 Dynare Team +% Copyright © 2013-2023 Dynare Team % % This file is part of Dynare. % @@ -39,7 +39,7 @@ else end end -return +return % --*-- Unit tests --*-- %@test:1 % Define a data set. @@ -98,4 +98,4 @@ if t(1) t(3) = dassert(ts1.data, A); end T = all(t); -%@eof:2 \ No newline at end of file +%@eof:2 diff --git a/src/@dseries/cumsum_.m b/src/@dseries/cumsum_.m index 2e844e76cb610f33a764ca4460a0f3f642072965..7782dd036aa5187fcab5cb26d3566a1817693065 100644 --- a/src/@dseries/cumsum_.m +++ b/src/@dseries/cumsum_.m @@ -1,4 +1,4 @@ -function o = cumsum_(varargin) % --*-- Unitary tests --*-- +function o = cumsum_(varargin) % Overloads matlab's cumsum function for dseries objects. % @@ -10,7 +10,7 @@ function o = cumsum_(varargin) % --*-- Unitary tests --*-- % OUTPUTS % - o dseries object. -% Copyright © 2013-2021 Dynare Team +% Copyright © 2013-2023 Dynare Team % % This file is part of Dynare. % @@ -126,7 +126,7 @@ switch nargin error('dseries::cumsum: Wrong number of input arguments!') end -return +return % --*-- Unit tests --*-- %@test:1 % Define a data set. @@ -293,4 +293,4 @@ if t(1) t(2) = dassert(ts0.data, A); end T = all(t); -%@eof:6 \ No newline at end of file +%@eof:6 diff --git a/src/@dseries/detrend.m b/src/@dseries/detrend.m index 850abcb4cfa70781677810a0a0947f5011ae5cd2..ea470c50d702f3570b6d3c521a01498a3ead0c41 100644 --- a/src/@dseries/detrend.m +++ b/src/@dseries/detrend.m @@ -1,4 +1,4 @@ -function o = detrend(o, model) % --*-- Unitary tests --*-- +function o = detrend(o, model) % Detrends a dseries object with a polynomial of order model. % @@ -9,7 +9,7 @@ function o = detrend(o, model) % --*-- Unitary tests --*-- % OUTPUTS % - o [dseries] detrended time series. -% Copyright © 2014-2021 Dynare Team +% Copyright © 2014-2023 Dynare Team % % This file is part of Dynare. % @@ -34,7 +34,7 @@ end o = copy(o); o.detrend_(model); -return +return % --*-- Unit tests --*-- %@test:1 % Define a dataset. @@ -53,4 +53,4 @@ if t(1) end T = all(t); -%@eof:1 \ No newline at end of file +%@eof:1 diff --git a/src/@dseries/detrend_.m b/src/@dseries/detrend_.m index 9b9862b7d1be247292f13e8c4ae34754baa39668..a71659badcf53e8c5206a3c125fa61976d209e2e 100644 --- a/src/@dseries/detrend_.m +++ b/src/@dseries/detrend_.m @@ -1,4 +1,4 @@ -function o = detrend_(o, model) % --*-- Unitary tests --*-- +function o = detrend_(o, model) % Detrends a dseries object with a polynomial of order model. % @@ -9,7 +9,7 @@ function o = detrend_(o, model) % --*-- Unitary tests --*-- % OUTPUTS % - o [dseries] detrended time series. -% Copyright © 2014-2021 Dynare Team +% Copyright © 2014-2023 Dynare Team % % This file is part of Dynare. % @@ -60,7 +60,7 @@ for i=1:vobs(o) end end -return +return % --*-- Unit tests --*-- %@test:1 % Define a dataset. @@ -146,4 +146,4 @@ if t(1) end T = all(t); -%@eof:2 \ No newline at end of file +%@eof:2 diff --git a/src/@dseries/dgrowth.m b/src/@dseries/dgrowth.m index 38f27bd6f64cc279e5b978be87f06b25b843dfe2..5d92e1dece1568aaad9cde115894b369bd0c3b36 100644 --- a/src/@dseries/dgrowth.m +++ b/src/@dseries/dgrowth.m @@ -1,4 +1,4 @@ -function o = dgrowth(o) % --*-- Unitary tests --*-- +function o = dgrowth(o) % Computes daily growth rates. % @@ -8,7 +8,7 @@ function o = dgrowth(o) % --*-- Unitary tests --*-- % OUTPUTS % - o [dseries] -% Copyright © 2020-2021 Dynare Team +% Copyright © 2020-2023 Dynare Team % % This file is part of Dynare. % @@ -28,7 +28,7 @@ function o = dgrowth(o) % --*-- Unitary tests --*-- o = copy(o); o.dgrowth_(); -return +return % --*-- Unit tests --*-- %@test:1 try @@ -48,4 +48,4 @@ if t(1) end T = all(t); -%@eof:1 \ No newline at end of file +%@eof:1 diff --git a/src/@dseries/dgrowth_.m b/src/@dseries/dgrowth_.m index 1c2289049fbb9061a07b2b54a47a8745ddb6e0ed..2fa6471dbc54bf2c48dcb75f1417f87f7665fc0d 100644 --- a/src/@dseries/dgrowth_.m +++ b/src/@dseries/dgrowth_.m @@ -1,4 +1,4 @@ -function o = dgrowth_(o) % --*-- Unitary tests --*-- +function o = dgrowth_(o) % Computes daily growth rates. % @@ -8,7 +8,7 @@ function o = dgrowth_(o) % --*-- Unitary tests --*-- % OUTPUTS % - o [dseries] -% Copyright © 2020-2021 Dynare Team +% Copyright © 2020-2023 Dynare Team % % This file is part of Dynare. % @@ -35,7 +35,7 @@ switch frequency(o) case 12 error('dseries::dgrowth: I cannot compute daily growth rates from monthly data!') case 52 - error('dseries::dgrowth: I cannot compute daily growth rates from weekly data!') + error('dseries::dgrowth: I cannot compute daily growth rates from weekly data!') case 365 o.data(2:end,:) = o.data(2:end,:)./o.data(1:end-1,:) - 1; o.data(1,:) = NaN; @@ -51,7 +51,7 @@ for i = 1:vobs(o) end end -return +return % --*-- Unit tests --*-- %@test:1 try diff --git a/src/@dseries/diff.m b/src/@dseries/diff.m index 3a44274e0baf8409c8cd6558bf11eccb5b1d42e7..781615e9cfccf5042877fbadd4be704c449eb94e 100644 --- a/src/@dseries/diff.m +++ b/src/@dseries/diff.m @@ -1,4 +1,4 @@ -function o = diff(o) % --*-- Unitary tests --*-- +function o = diff(o) % Computes differences. % @@ -8,7 +8,7 @@ function o = diff(o) % --*-- Unitary tests --*-- % OUTPUTS % - o [dseries] -% Copyright © 2017-2021 Dynare Team +% Copyright © 2017-2023 Dynare Team % % This file is part of Dynare. % @@ -28,7 +28,7 @@ function o = diff(o) % --*-- Unitary tests --*-- o = copy(o); o.diff_(); -return +return % --*-- Unit tests --*-- %@test:1 try @@ -48,4 +48,4 @@ if t(1) end T = all(t); -%@eof:1 \ No newline at end of file +%@eof:1 diff --git a/src/@dseries/diff_.m b/src/@dseries/diff_.m index 5acec572b0d69f22af42cf4a382d050ccd5fd600..8609a99e3646ffdd003504285fc194bfb44a857a 100644 --- a/src/@dseries/diff_.m +++ b/src/@dseries/diff_.m @@ -1,4 +1,4 @@ -function o = diff_(o) % --*-- Unitary tests --*-- +function o = diff_(o) % Computes differences, independently of the frequency. % @@ -8,7 +8,7 @@ function o = diff_(o) % --*-- Unitary tests --*-- % OUTPUTS % - o [dseries] -% Copyright © 2017-2021 Dynare Team +% Copyright © 2017-2023 Dynare Team % % This file is part of Dynare. % @@ -36,7 +36,7 @@ for i = 1:vobs(o) end end -return +return % --*-- Unit tests --*-- %@test:1 try @@ -55,4 +55,4 @@ if t(1) end T = all(t); -%@eof:1 \ No newline at end of file +%@eof:1 diff --git a/src/@dseries/dseries.m b/src/@dseries/dseries.m index bb58198911aeff9d88cda2fecc8d745e240f2401..738566de425b718d327e354b6150f14983caa43d 100644 --- a/src/@dseries/dseries.m +++ b/src/@dseries/dseries.m @@ -1,8 +1,8 @@ -classdef dseries<handle % --*-- Unitary tests --*-- +classdef dseries<handle % Class for time series. -% Copyright © 2013-2021 Dynare Team +% Copyright © 2013-2023 Dynare Team % % This code is free software: you can redistribute it and/or modify % it under the terms of the GNU General Public License as published by @@ -178,7 +178,7 @@ methods end end % dseries end % methods -end % classdef +end % classdef --*-- Unit tests --*-- %@test:1 %$ % Test if we can instantiate an empty dseries object. diff --git a/src/@dseries/eq.m b/src/@dseries/eq.m index 6ddc1dac660ebf09caa023bbfdef671c8e7dce1d..d32e485457e60b047499c9fe2ea70b99e006ff22 100644 --- a/src/@dseries/eq.m +++ b/src/@dseries/eq.m @@ -1,4 +1,4 @@ -function b = eq(o, p) % --*-- Unitary tests --*-- +function b = eq(o, p) % Overloads eq (==) operator. % @@ -12,7 +12,7 @@ function b = eq(o, p) % --*-- Unitary tests --*-- % REMARKS % If the number of variables, the number of observations or the frequencies are different in A and B, the function returns a zero scalar. -% Copyright © 2013-2021 Dynare Team +% Copyright © 2013-2023 Dynare Team % % This file is part of Dynare. % @@ -63,7 +63,7 @@ end b = eq(o.data, p.data); -return +return % --*-- Unit tests --*-- %@test:1 % Define a datasets. @@ -88,4 +88,4 @@ if length(t)>1 t(2) = dassert(a,logical(ones(10,3))); end T = all(t); -%@eof:1 \ No newline at end of file +%@eof:1 diff --git a/src/@dseries/exist.m b/src/@dseries/exist.m index c01dbc2ecaeddbab36ef810735e73e39773374e1..0d764ca81e9d9c44ddb44392724fe1da149887a7 100644 --- a/src/@dseries/exist.m +++ b/src/@dseries/exist.m @@ -1,4 +1,4 @@ -function l = exist(o, varname) % --*-- Unitary tests --*-- +function l = exist(o, varname) % Tests if a variable exists in dseries object o. % @@ -9,7 +9,7 @@ function l = exist(o, varname) % --*-- Unitary tests --*-- % OUTPUTS % - l [logical], equal to 1 (true) iff varname is a variable in dseries object o. -% Copyright © 2014-2021 Dynare Team +% Copyright © 2014-2023 Dynare Team % % This file is part of Dynare. % @@ -36,7 +36,7 @@ end l = ~isempty(strmatch(varname, o.name, 'exact')); -return +return % --*-- Unit tests --*-- %@test:1 % Define a datasets. diff --git a/src/@dseries/exp.m b/src/@dseries/exp.m index ee3d1ad3bb3b94eeebf481a2372186229c40f628..0fb3487fc36c6a9866bd0b76d5459f1563a17654 100644 --- a/src/@dseries/exp.m +++ b/src/@dseries/exp.m @@ -1,4 +1,4 @@ -function o = exp(o) % --*-- Unitary tests --*-- +function o = exp(o) % Apply the exponential to all the variables in a dseries object (without in place modification). % @@ -8,7 +8,7 @@ function o = exp(o) % --*-- Unitary tests --*-- % OUTPUTS % - o [dseries] -% Copyright © 2011-2021 Dynare Team +% Copyright © 2011-2023 Dynare Team % % This file is part of Dynare. % @@ -28,7 +28,7 @@ function o = exp(o) % --*-- Unitary tests --*-- o = copy(o); o.exp_(); -return +return % --*-- Unit tests --*-- %@test:1 % Define a dates object @@ -79,4 +79,4 @@ if t(1) end T = all(t); -%@eof:2 \ No newline at end of file +%@eof:2 diff --git a/src/@dseries/exp_.m b/src/@dseries/exp_.m index 83fcd2bfc1c18fc5f0cc6ba2db87b8ab4937de25..3e97d4266040a6c6eb5d6df289567ee75ea38d27 100644 --- a/src/@dseries/exp_.m +++ b/src/@dseries/exp_.m @@ -1,4 +1,4 @@ -function o = exp_(o) % --*-- Unitary tests --*-- +function o = exp_(o) % Apply the exponential to all the variables in a dseries object (in place modification). % @@ -8,7 +8,7 @@ function o = exp_(o) % --*-- Unitary tests --*-- % OUTPUTS % - o [dseries] -% Copyright © 2015-2021 Dynare Team +% Copyright © 2015-2023 Dynare Team % % This file is part of Dynare. % @@ -35,7 +35,7 @@ for i=1:vobs(o) end end -return +return % --*-- Unit tests --*-- %@test:1 % Define a dates object @@ -93,4 +93,4 @@ if t(1) end T = all(t); -%@eof:2 \ No newline at end of file +%@eof:2 diff --git a/src/@dseries/extract.m b/src/@dseries/extract.m index ca3371004cdd0443f9e8578ad85b720ec0a8fa3b..6202c6e3ca671708fd316388d23ed69775db1979 100644 --- a/src/@dseries/extract.m +++ b/src/@dseries/extract.m @@ -1,8 +1,8 @@ -function p = extract(o, varargin) % --*-- Unitary tests --*-- +function p = extract(o, varargin) % Extract some variables from a database. -% Copyright © 2012-2021 Dynare Team +% Copyright © 2012-2023 Dynare Team % % This file is part of Dynare. % @@ -99,7 +99,7 @@ p.name = o.name(idVariableName); p.tex = o.tex(idVariableName); p.ops = o.ops(idVariableName); -return +return % --*-- Unit tests --*-- %@test:1 % Define a data set. @@ -189,4 +189,4 @@ if t(1) end T = all(t); -%@eof:3 \ No newline at end of file +%@eof:3 diff --git a/src/@dseries/firstdate.m b/src/@dseries/firstdate.m index ab834788fa98256025bce9ccfa6275eb7352b943..3b119f9a58a5244a0df1edff1d998f84e85b2224 100644 --- a/src/@dseries/firstdate.m +++ b/src/@dseries/firstdate.m @@ -1,6 +1,6 @@ -function f = firstdate(o) % --*-- Unitary tests --*-- +function f = firstdate(o) -% Copyright © 2014-2021 Dynare Team +% Copyright © 2014-2023 Dynare Team % % This file is part of Dynare. % @@ -19,7 +19,7 @@ function f = firstdate(o) % --*-- Unitary tests --*-- f = o.dates(1); -return +return % --*-- Unit tests --*-- %@test:1 try diff --git a/src/@dseries/firstobservedperiod.m b/src/@dseries/firstobservedperiod.m index 3b89055501157ecace94e82fdf04e9573214041d..b665075747ef27d200b0c6ca5172755e3402dd48 100644 --- a/src/@dseries/firstobservedperiod.m +++ b/src/@dseries/firstobservedperiod.m @@ -1,4 +1,4 @@ -function d = firstobservedperiod(o) % --*-- Unitary tests --*-- +function d = firstobservedperiod(o) % Returns the first period where all the variables are observed (first period without NaNs). % @@ -8,7 +8,7 @@ function d = firstobservedperiod(o) % --*-- Unitary tests --*-- % OUTPUTS % - d [dates] First period where the N variables are observed (without NaNs). -% Copyright © 2016-2021 Dynare Team +% Copyright © 2016-2023 Dynare Team % % This file is part of Dynare. % @@ -34,7 +34,7 @@ end d = firstdate(o)+(c(1)-1); -return +return % --*-- Unit tests --*-- %@test:1 try diff --git a/src/@dseries/flip.m b/src/@dseries/flip.m index 104cc0d51116070ad661d4861a3b214cdffe838a..22505cc85d9c3f6ecb5a909b0c59075aa3953431 100644 --- a/src/@dseries/flip.m +++ b/src/@dseries/flip.m @@ -1,4 +1,4 @@ -function o = flip(o) % --*-- Unitary tests --*-- +function o = flip(o) % Flips the rows in the data member (without changing the % periods order) @@ -9,7 +9,7 @@ function o = flip(o) % --*-- Unitary tests --*-- % OUTPUTS % - o [dseries] -% Copyright © 2020 Dynare Team +% Copyright © 2020-2023 Dynare Team % % This file is part of Dynare. % @@ -29,7 +29,8 @@ function o = flip(o) % --*-- Unitary tests --*-- o = copy(o); o.flip_; -return +return % --*-- Unit tests --*-- + %@test:1 % Define a dates object data = transpose(1:3); @@ -50,4 +51,4 @@ if t(1) end T = all(t); -%@eof:1 \ No newline at end of file +%@eof:1 diff --git a/src/@dseries/flip_.m b/src/@dseries/flip_.m index b2a1054b9366071cded9e06535ed1a6820947199..5a86666d74c78c39af2aace1a1828b53da60ec4f 100644 --- a/src/@dseries/flip_.m +++ b/src/@dseries/flip_.m @@ -1,4 +1,4 @@ -function o = flip_(o) % --*-- Unitary tests --*-- +function o = flip_(o) % Flips the rows in the data member (without changing the % periods order) @@ -9,7 +9,7 @@ function o = flip_(o) % --*-- Unitary tests --*-- % OUTPUTS % - o [dseries] -% Copyright © 2020 Dynare Team +% Copyright © 2020-2023 Dynare Team % % This file is part of Dynare. % @@ -36,7 +36,8 @@ end o.data = flipud(o.data); -return +return % --*-- Unit tests --*-- + %@test:1 % Define a dates object data = [transpose(1:3) transpose(4:6)]; @@ -67,35 +68,35 @@ T = all(t); %@eof:1 %@test:2 -%$ % Define a dates object -%$ data = [ones(10,1), -ones(10,1)]; -%$ o = dseries(data); -%$ q = o; -%$ r = copy(o); -%$ -%$ % Call the tested routine. -%$ try -%$ o.abs_(); -%$ t(1) = true; -%$ catch -%$ t(1) = false; -%$ end -%$ -%$ if t(1) -%$ t(2) = dassert(length(o.name), 2); -%$ t(3) = dassert(o.name{1},'Variable_1'); -%$ t(4) = dassert(o.name{2},'Variable_2'); -%$ t(5) = dassert(q.name{1},'Variable_1'); -%$ t(6) = dassert(q.name{2},'Variable_2'); -%$ t(7) = dassert(r.name{1},'Variable_1'); -%$ t(8) = dassert(r.name{2},'Variable_2'); -%$ t(9) = dassert(o.ops{1},'abs(Variable_1)'); -%$ t(10) = dassert(o.ops{2},'abs(Variable_2)'); -%$ t(11) = dassert(q.ops{1},'abs(Variable_1)'); -%$ t(12) = dassert(q.ops{2},'abs(Variable_2)'); -%$ t(13) = isempty(r.ops{1}); -%$ t(14) = isempty(r.ops{2}); -%$ end -%$ -%$ T = all(t); -%@eof:2 \ No newline at end of file +% Define a dates object +data = [ones(10,1), -ones(10,1)]; +o = dseries(data); +q = o; +r = copy(o); + +% Call the tested routine. +try + o.abs_(); + t(1) = true; +catch + t(1) = false; +end + +if t(1) + t(2) = dassert(length(o.name), 2); + t(3) = dassert(o.name{1},'Variable_1'); + t(4) = dassert(o.name{2},'Variable_2'); + t(5) = dassert(q.name{1},'Variable_1'); + t(6) = dassert(q.name{2},'Variable_2'); + t(7) = dassert(r.name{1},'Variable_1'); + t(8) = dassert(r.name{2},'Variable_2'); + t(9) = dassert(o.ops{1},'abs(Variable_1)'); + t(10) = dassert(o.ops{2},'abs(Variable_2)'); + t(11) = dassert(q.ops{1},'abs(Variable_1)'); + t(12) = dassert(q.ops{2},'abs(Variable_2)'); + t(13) = isempty(r.ops{1}); + t(14) = isempty(r.ops{2}); +end + +T = all(t); +%@eof:2 diff --git a/src/@dseries/ge.m b/src/@dseries/ge.m index a82a66b2773868a2e6d4f968c16fe76fb7559622..cf2e68b0a09f341301170b77f68d18977a381c24 100644 --- a/src/@dseries/ge.m +++ b/src/@dseries/ge.m @@ -1,8 +1,8 @@ -function l = ge(varargin) % --*-- Unitary tests --*-- +function l = ge(varargin) % Overloads the >= operator for dseries objects. -% Copyright © 2021 Dynare Team +% Copyright © 2021-2023 Dynare Team % % This code is free software: you can redistribute it and/or modify % it under the terms of the GNU General Public License as published by @@ -25,4 +25,4 @@ elseif isdseries(varargin{1}) && isdseries(varargin{2}) l = varargin{1}.data>=varargin{2}.data; else error('dseries::ge: wrong types.') -end \ No newline at end of file +end diff --git a/src/@dseries/gt.m b/src/@dseries/gt.m index 84d067cd23da2318c72e324494289ed613237d8e..4ee4f56d2432f417e7c5656eeb24d616b425135c 100644 --- a/src/@dseries/gt.m +++ b/src/@dseries/gt.m @@ -1,8 +1,8 @@ -function l = gt(varargin) % --*-- Unitary tests --*-- +function l = gt(varargin) % Overloads the > operator for dseries objects. -% Copyright © 2021 Dynare Team +% Copyright © 2021-2023 Dynare Team % % This code is free software: you can redistribute it and/or modify % it under the terms of the GNU General Public License as published by @@ -25,4 +25,4 @@ elseif isdseries(varargin{1}) && isdseries(varargin{2}) l = varargin{1}.data>varargin{2}.data; else error('dseries::gt: wrong types.') -end \ No newline at end of file +end diff --git a/src/@dseries/hdiff.m b/src/@dseries/hdiff.m index be154b746c23ff888ffdefa1427968d69bb1f20c..7d6240f4e39c0a699f9dfe1983dfe609ef98c343 100644 --- a/src/@dseries/hdiff.m +++ b/src/@dseries/hdiff.m @@ -1,4 +1,4 @@ -function o = hdiff(o) % --*-- Unitary tests --*-- +function o = hdiff(o) % Computes bi-annual differences. % @@ -8,7 +8,7 @@ function o = hdiff(o) % --*-- Unitary tests --*-- % OUTPUTS % - o [dseries] -% Copyright © 2020-2021 Dynare Team +% Copyright © 2020-2023 Dynare Team % % This file is part of Dynare. % @@ -28,7 +28,7 @@ function o = hdiff(o) % --*-- Unitary tests --*-- o = copy(o); o.hdiff_(); -return +return % --*-- Unit tests --*-- %@test:1 try @@ -48,4 +48,4 @@ if t(1) end T = all(t); -%@eof:1 \ No newline at end of file +%@eof:1 diff --git a/src/@dseries/hdiff_.m b/src/@dseries/hdiff_.m index bc5d557f21c003e781ce8594de4b87bb1814979b..f31c0be6bd57a8c06aef5ddadf80415a5bcfee18 100644 --- a/src/@dseries/hdiff_.m +++ b/src/@dseries/hdiff_.m @@ -1,4 +1,4 @@ -function o = hdiff_(o) % --*-- Unitary tests --*-- +function o = hdiff_(o) % Computes bi-annual differences. % @@ -8,7 +8,7 @@ function o = hdiff_(o) % --*-- Unitary tests --*-- % OUTPUTS % - o [dseries] -% Copyright © 2020-2021 Dynare Team +% Copyright © 2020-2023 Dynare Team % % This file is part of Dynare. % @@ -53,7 +53,7 @@ for i = 1:vobs(o) end end -return +return % --*-- Unit tests --*-- %@test:1 try @@ -141,4 +141,4 @@ if t(1) end T = all(t); -%@eof:5 \ No newline at end of file +%@eof:5 diff --git a/src/@dseries/hgrowth.m b/src/@dseries/hgrowth.m index 5604b65d2d92d478d1591a4f0aed303de15e4aa7..6b64ec6cb13c061c58989c11b03a886c31079c30 100644 --- a/src/@dseries/hgrowth.m +++ b/src/@dseries/hgrowth.m @@ -1,4 +1,4 @@ -function o = hgrowth(o) % --*-- Unitary tests --*-- +function o = hgrowth(o) % Computes bi-annual growth rates. % @@ -8,7 +8,7 @@ function o = hgrowth(o) % --*-- Unitary tests --*-- % OUTPUTS % - o [dseries] -% Copyright © 2020-2021 Dynare Team +% Copyright © 2020-2023 Dynare Team % % This file is part of Dynare. % @@ -28,7 +28,7 @@ function o = hgrowth(o) % --*-- Unitary tests --*-- o = copy(o); o.hgrowth_(); -return +return % --*-- Unit tests --*-- %@test:1 t = zeros(2,1); @@ -51,4 +51,4 @@ if length(t)>1 end T = all(t); -%@eof:1 \ No newline at end of file +%@eof:1 diff --git a/src/@dseries/hgrowth_.m b/src/@dseries/hgrowth_.m index b1eefed4f09539b52a697ae29f5c78a86cb105d6..8413a96705b95bd94cb9c46214e8eb6f38fb86d7 100644 --- a/src/@dseries/hgrowth_.m +++ b/src/@dseries/hgrowth_.m @@ -1,4 +1,4 @@ -function o = hgrowth_(o) % --*-- Unitary tests --*-- +function o = hgrowth_(o) % Computes bi-annual growth rates. % @@ -8,7 +8,7 @@ function o = hgrowth_(o) % --*-- Unitary tests --*-- % OUTPUTS % - o [dseries] -% Copyright © 2020-2021 Dynare Team +% Copyright © 2020-2023 Dynare Team % % This file is part of Dynare. % @@ -53,7 +53,7 @@ for i = 1:vobs(o) end end -return +return % --*-- Unit tests --*-- %@test:1 try diff --git a/src/@dseries/horzcat.m b/src/@dseries/horzcat.m index 1f75c3ec76b2e6f515341150978cce3de76ff4d9..aae083065eb6621081da7135b34aef341c3d4387 100644 --- a/src/@dseries/horzcat.m +++ b/src/@dseries/horzcat.m @@ -1,4 +1,4 @@ -function o = horzcat(varargin) % --*-- Unitary tests --*-- +function o = horzcat(varargin) % Overloads horzcat method for dseries objects. % @@ -20,7 +20,7 @@ function o = horzcat(varargin) % --*-- Unitary tests --*-- % REMARKS % o o1, o2, ... must not have common variables. -% Copyright © 2011-2021 Dynare Team +% Copyright © 2011-2023 Dynare Team % % This file is part of Dynare. % @@ -136,7 +136,7 @@ else a.dates = sort(unique(hd)); end -return +return % --*-- Unit tests --*-- %@test:1 % Define a data set. diff --git a/src/@dseries/hpcycle.m b/src/@dseries/hpcycle.m index 1458c0212e466b5d390e2bb18ba7c0a05824d084..59451762227a204976f698ee109ca8519760b0b9 100644 --- a/src/@dseries/hpcycle.m +++ b/src/@dseries/hpcycle.m @@ -1,4 +1,4 @@ -function o = hpcycle(o, lambda) % --*-- Unitary tests --*-- +function o = hpcycle(o, lambda) % Extracts the cycle component from a dseries object using Hodrick Prescott filter. % @@ -9,7 +9,7 @@ function o = hpcycle(o, lambda) % --*-- Unitary tests --*-- % OUTPUTS % - o [dseries] Cyclical component of the original time series. -% Copyright © 2013-2021 Dynare Team +% Copyright © 2013-2023 Dynare Team % % This file is part of Dynare. % @@ -37,7 +37,7 @@ end o = copy(o); o.hpcycle_(lambda); -return +return % --*-- Unit tests --*-- %@test:1 d = randn(100,1); @@ -55,4 +55,4 @@ if t(1) end T = all(t); -%@eof:1 \ No newline at end of file +%@eof:1 diff --git a/src/@dseries/hpcycle_.m b/src/@dseries/hpcycle_.m index c5c3a2b76ddbe18ec92ec3abedd619be6c33832f..7957c2530dfa2bcdb5e4454b4ef7da06944bedaa 100644 --- a/src/@dseries/hpcycle_.m +++ b/src/@dseries/hpcycle_.m @@ -1,4 +1,4 @@ -function o = hpcycle_(o, lambda) % --*-- Unitary tests --*-- +function o = hpcycle_(o, lambda) % Extracts the cycle component from a dseries object using Hodrick Prescott filter. % @@ -9,7 +9,7 @@ function o = hpcycle_(o, lambda) % --*-- Unitary tests --*-- % OUTPUTS % - o [dseries] Cyclical component of the original time series. -% Copyright © 2013-2021 Dynare Team +% Copyright © 2013-2023 Dynare Team % % This file is part of Dynare. % @@ -53,7 +53,7 @@ for i=1:vobs(o) end end -return +return % --*-- Unit tests --*-- %@test:1 plot_flag = false; @@ -104,4 +104,4 @@ if plot_flag end T = all(t); -%@eof:1 \ No newline at end of file +%@eof:1 diff --git a/src/@dseries/hptrend.m b/src/@dseries/hptrend.m index ba35138dcd75a5e9e83dac162284dd3b5a640ac2..9561cfd1b0282f747316bc238774a0c120af7111 100644 --- a/src/@dseries/hptrend.m +++ b/src/@dseries/hptrend.m @@ -1,4 +1,4 @@ -function o = hptrend(o, lambda) % --*-- Unitary tests --*-- +function o = hptrend(o, lambda) % Extracts the trend component from a dseries object using Hodrick Prescott filter. % @@ -9,7 +9,7 @@ function o = hptrend(o, lambda) % --*-- Unitary tests --*-- % OUTPUTS % - o [dseries] Trend component of the original time series. -% Copyright © 2013-2021 Dynare Team +% Copyright © 2013-2023 Dynare Team % % This file is part of Dynare. % @@ -37,7 +37,7 @@ end o = copy(o); o.hptrend_(lambda); -return +return % --*-- Unit tests --*-- %@test:1 d = randn(100,1); @@ -55,4 +55,4 @@ if t(1) end T = all(t); -%@eof:1 \ No newline at end of file +%@eof:1 diff --git a/src/@dseries/hptrend_.m b/src/@dseries/hptrend_.m index 8fcf22d4fa1f7bce9ee5cb2e021944fffcdfcb8f..763c0ef7b76ec56febd13e4fc62b1a506f73b407 100644 --- a/src/@dseries/hptrend_.m +++ b/src/@dseries/hptrend_.m @@ -1,4 +1,4 @@ -function o = hptrend_(o, lambda) % --*-- Unitary tests --*-- +function o = hptrend_(o, lambda) % Extracts the trend component from a dseries object using Hodrick Prescott filter. % @@ -9,7 +9,7 @@ function o = hptrend_(o, lambda) % --*-- Unitary tests --*-- % OUTPUTS % - o [dseries] Trend component of the original time series. -% Copyright © 2013-2021 Dynare Team +% Copyright © 2013-2023 Dynare Team % % This file is part of Dynare. % @@ -52,7 +52,7 @@ for i=1:vobs(o) end end -return +return % --*-- Unit tests --*-- %@test:1 plot_flag = 0; @@ -102,4 +102,4 @@ if plot_flag system('convert -density 300 ../doc/dynare.plots/HPTrend.eps ../doc/dynare.plots/HPTrend.jpg'); end T = all(t); -%@eof:1 \ No newline at end of file +%@eof:1 diff --git a/src/@dseries/insert.m b/src/@dseries/insert.m index 6b616de92e29e6ad77eec79dc9514a6494550852..aba6ceca6933f2bfd8da8d6321a8f34ac5e7b339 100644 --- a/src/@dseries/insert.m +++ b/src/@dseries/insert.m @@ -1,4 +1,4 @@ -function o = insert(o, p, id) % --*-- Unitary tests --*-- +function o = insert(o, p, id) % Adds a variable in a dseries object. % @@ -10,7 +10,7 @@ function o = insert(o, p, id) % --*-- Unitary tests --*-- % OUTPUTS % - o [dseries] -% Copyright © 2013-2021 Dynare Team +% Copyright © 2013-2023 Dynare Team % % This file is part of Dynare. % @@ -109,7 +109,7 @@ for i=1:n id = id+1; end -return +return % --*-- Unit tests --*-- %@test:1 % Define a datasets. @@ -187,4 +187,4 @@ if length(t)>1 t(5) = dassert(ts2.data, B); end T = all(t); -%@eof:2 \ No newline at end of file +%@eof:2 diff --git a/src/@dseries/isinf.m b/src/@dseries/isinf.m index 92b047a023aa3b773f91e2709a63492afe583a25..1142855eb096442ddf64f9331d169ad075753ea5 100644 --- a/src/@dseries/isinf.m +++ b/src/@dseries/isinf.m @@ -1,4 +1,4 @@ -function b = isinf(o) % --*-- Unitary tests --*-- +function b = isinf(o) % Returns an array of logicals (true/false). % Element (t,i) is true iff the i-th variable at period number t is an Inf. @@ -10,7 +10,7 @@ function b = isinf(o) % --*-- Unitary tests --*-- % - b [logical] T*N array of logicals. -% Copyright © 2019-2021 Dynare Team +% Copyright © 2019-2023 Dynare Team % % This file is part of Dynare. % @@ -29,7 +29,7 @@ function b = isinf(o) % --*-- Unitary tests --*-- b = isinf(o.data); -return +return % --*-- Unit tests --*-- %@test:1 try diff --git a/src/@dseries/isnan.m b/src/@dseries/isnan.m index f42c9e66f8c32b2ade1d6aecce25af62d7df2a77..e0377494550f23c376b718f1510d49c571208559 100644 --- a/src/@dseries/isnan.m +++ b/src/@dseries/isnan.m @@ -1,4 +1,4 @@ -function b = isnan(o) % --*-- Unitary tests --*-- +function b = isnan(o) % Returns an array of logicals (true/false). Element (t,i) is true iff the i-th variable at % period number t is a NaN. @@ -10,7 +10,7 @@ function b = isnan(o) % --*-- Unitary tests --*-- % - b [logical] T*N array of logicals. -% Copyright © 2016-2021 Dynare Team +% Copyright © 2016-2023 Dynare Team % % This file is part of Dynare. % @@ -29,7 +29,7 @@ function b = isnan(o) % --*-- Unitary tests --*-- b = isnan(o.data); -return +return % --*-- Unit tests --*-- %@test:1 try diff --git a/src/@dseries/isreal.m b/src/@dseries/isreal.m index 121ec46ead8fff0e0b5d0487aedf7dd5e741bf14..55d9436ecd51d121fedcc88388d3bfff2bdde448 100644 --- a/src/@dseries/isreal.m +++ b/src/@dseries/isreal.m @@ -1,4 +1,4 @@ -function b = isreal(o) % --*-- Unitary tests --*-- +function b = isreal(o) % Returns true if no elements of the dseries have imaginary parts. % Returns false otherwise @@ -10,7 +10,7 @@ function b = isreal(o) % --*-- Unitary tests --*-- % - b [logical] true iff all elements are real; false otherwise. -% Copyright © 2019-2021 Dynare Team +% Copyright © 2019-2023 Dynare Team % % This file is part of Dynare. % @@ -29,7 +29,7 @@ function b = isreal(o) % --*-- Unitary tests --*-- b = isreal(o.data); -return +return % --*-- Unit tests --*-- %@test:1 try diff --git a/src/@dseries/lag.m b/src/@dseries/lag.m index 9f9f9addc5136be25656196de28af1f2c59dc99b..b5fe32a623bf97c45fe5419d3421b0375c031a57 100644 --- a/src/@dseries/lag.m +++ b/src/@dseries/lag.m @@ -1,4 +1,4 @@ -function o = lag(o, p) % --*-- Unitary tests --*-- +function o = lag(o, p) % Returns a lagged time series % @@ -23,7 +23,7 @@ function o = lag(o, p) % --*-- Unitary tests --*-- % 4Y | 3 % 5Y | 4 -% Copyright © 2013-2021 Dynare Team +% Copyright © 2013-2023 Dynare Team % % This file is part of Dynare. % @@ -48,7 +48,7 @@ end o = copy(o); o.lag_(p); -return +return % --*-- Unit tests --*-- %@test:1 try @@ -71,4 +71,4 @@ if t(1) end T = all(t); -%@eof:1 \ No newline at end of file +%@eof:1 diff --git a/src/@dseries/lag_.m b/src/@dseries/lag_.m index c2832056f899c68e4697bf2fd246ddfd74333481..5a1bc09bf7c43630375fa2b99609a5ba040a4e7d 100644 --- a/src/@dseries/lag_.m +++ b/src/@dseries/lag_.m @@ -1,4 +1,4 @@ -function o = lag_(o, p) % --*-- Unitary tests --*-- +function o = lag_(o, p) % Returns a lagged time series % @@ -23,7 +23,7 @@ function o = lag_(o, p) % --*-- Unitary tests --*-- % 4Y | 3 % 5Y | 4 -% Copyright © 2013-2021 Dynare Team +% Copyright © 2013-2023 Dynare Team % % This file is part of Dynare. % @@ -75,7 +75,7 @@ for i=1:vobs(o) end end -return +return % --*-- Unit tests --*-- %@test:1 try @@ -111,4 +111,4 @@ if t(1) end T = all(t); -%@eof:2 \ No newline at end of file +%@eof:2 diff --git a/src/@dseries/lastobservedperiod.m b/src/@dseries/lastobservedperiod.m index e2e565e952fcef5375d081e9cde98d46a2a99fa3..0f96f0b7142c5e65609b5bddd48e1b7dc1cc0267 100644 --- a/src/@dseries/lastobservedperiod.m +++ b/src/@dseries/lastobservedperiod.m @@ -1,4 +1,4 @@ -function d = lastobservedperiod(o) % --*-- Unitary tests --*-- +function d = lastobservedperiod(o) % Returns the last period where all the variables are observed (last period without NaNs). % @@ -8,7 +8,7 @@ function d = lastobservedperiod(o) % --*-- Unitary tests --*-- % OUTPUTS % - b [dates] Last period where the N variables are observed (without NaNs). -% Copyright © 2017-2021 Dynare Team +% Copyright © 2017-2023 Dynare Team % % This file is part of Dynare. % @@ -32,7 +32,7 @@ if isempty(c) end d = firstdate(o)+(c(end)-1); -return +return % --*-- Unit tests --*-- %@test:1 try @@ -64,4 +64,4 @@ if t(1) end T = all(t); -%@eof:2 \ No newline at end of file +%@eof:2 diff --git a/src/@dseries/le.m b/src/@dseries/le.m index 27e2281d8f8d8056db982ccde8c34c03405d0542..f314f0784d1ef73d7db0f48a5354224cb681f6a0 100644 --- a/src/@dseries/le.m +++ b/src/@dseries/le.m @@ -1,8 +1,8 @@ -function l = le(varargin) % --*-- Unitary tests --*-- +function l = le(varargin) % Overloads the <= operator for dseries objects. -% Copyright © 2021 Dynare Team +% Copyright © 2021-2023 Dynare Team % % This code is free software: you can redistribute it and/or modify % it under the terms of the GNU General Public License as published by @@ -25,4 +25,4 @@ elseif isdseries(varargin{1}) && isdseries(varargin{2}) l = varargin{1}.data<=varargin{2}.data; else error('dseries::le: wrong types.') -end \ No newline at end of file +end diff --git a/src/@dseries/lead.m b/src/@dseries/lead.m index 33bf1353807866981ef83f381b7db46b8d1fffa3..ab64af25bd5a2c9971cb102125bae33a49aeb1e5 100644 --- a/src/@dseries/lead.m +++ b/src/@dseries/lead.m @@ -1,4 +1,4 @@ -function o = lead(o, p) % --*-- Unitary tests --*-- +function o = lead(o, p) % Returns a lagged time series % @@ -23,7 +23,7 @@ function o = lead(o, p) % --*-- Unitary tests --*-- % 4Y | 5 % 5Y | NaN -% Copyright © 2013-2021 Dynare Team +% Copyright © 2013-2023 Dynare Team % % This file is part of Dynare. % @@ -48,7 +48,7 @@ end o = copy(o); o.lead_(p); -return +return % --*-- Unit tests --*-- %@test:1 try @@ -72,4 +72,4 @@ if t(1) end T = all(t); -%@eof:1 \ No newline at end of file +%@eof:1 diff --git a/src/@dseries/lead_.m b/src/@dseries/lead_.m index bc3abfe3fd8681276d1299c4a706b9faa171e5a4..d4634418e061af90090a7928115c957abfc966ce 100644 --- a/src/@dseries/lead_.m +++ b/src/@dseries/lead_.m @@ -1,4 +1,4 @@ -function o = lead_(o, p) % --*-- Unitary tests --*-- +function o = lead_(o, p) % Returns a leaded time series % @@ -23,7 +23,7 @@ function o = lead_(o, p) % --*-- Unitary tests --*-- % 4Y | 5 % 5Y | NaN -% Copyright © 2013-2021 Dynare Team +% Copyright © 2013-2023 Dynare Team % % This file is part of Dynare. % @@ -75,7 +75,7 @@ for i=1:vobs(o) end end -return +return % --*-- Unit tests --*-- %@test:1 try @@ -128,4 +128,4 @@ if t(1) end T = all(t); -%@eof:3 \ No newline at end of file +%@eof:3 diff --git a/src/@dseries/length.m b/src/@dseries/length.m index 21f386ae2e0e04b442466885250e8b20c8432e30..86d89f3731f958a38efc33309bd333f2ef456426 100644 --- a/src/@dseries/length.m +++ b/src/@dseries/length.m @@ -1,8 +1,8 @@ -function length(o) % --*-- Unitary tests --*-- +function length(o) % Overloads size function. -% Copyright © 2017-2021 Dynare Team +% Copyright © 2017-2023 Dynare Team % % This file is part of Dynare. % @@ -22,7 +22,7 @@ function length(o) % --*-- Unitary tests --*-- error(['dseries::length: we do not support the length operator on ' ... 'dseries. Please use ''nobs'' or ''vobs''']); -return +return % --*-- Unit tests --*-- %@test:1 % Define a dates object @@ -35,4 +35,4 @@ catch end T = all(t); -%@eof:1 \ No newline at end of file +%@eof:1 diff --git a/src/@dseries/lineartrend.m b/src/@dseries/lineartrend.m index 7db400a75da1a6f77db930cafffe12bb2b042360..336161bdc658808a39cddec1c253cb5d0383070d 100644 --- a/src/@dseries/lineartrend.m +++ b/src/@dseries/lineartrend.m @@ -1,4 +1,4 @@ -function trend = lineartrend(o) % --*-- Unitary tests --*-- +function trend = lineartrend(o) % Returns a trend centered on zero. % @@ -6,12 +6,12 @@ function trend = lineartrend(o) % --*-- Unitary tests --*-- % - o [dseries] time series with T observations. % % OUTPUTS -% - trend [double] T*1 vector, linear trend with mean zero. +% - trend [double] T*1 vector, linear trend with mean zero. % % REMARKS -% the generic element of the returned argument is trend(i) = i - (n+1)/2. +% the generic element of the returned argument is trend(i) = i - (n+1)/2. -% Copyright © 2017 Dynare Team +% Copyright © 2017-2023 Dynare Team % % This file is part of Dynare. % @@ -30,7 +30,7 @@ function trend = lineartrend(o) % --*-- Unitary tests --*-- trend = transpose(1:o.nobs)-.5*(o.nobs+1); -return +return % --*-- Unit tests --*-- %@test:1 a = dseries(randn(100,3)); @@ -45,4 +45,4 @@ if t(1) t(2) = abs(mean(trend))<1e-12; end T = all(t); -%@eof:1 \ No newline at end of file +%@eof:1 diff --git a/src/@dseries/log.m b/src/@dseries/log.m index d6169c8aa36cb1e95ab3e2535cb06410b27aeb65..c9ef2f9138a3aa869b7b409c4dd2aade884e8e83 100644 --- a/src/@dseries/log.m +++ b/src/@dseries/log.m @@ -1,4 +1,4 @@ -function o = log(o) % --*-- Unitary tests --*-- +function o = log(o) % Apply the logarithm to all the variables in a dseries object (without in place modification). % @@ -8,7 +8,7 @@ function o = log(o) % --*-- Unitary tests --*-- % OUTPUTS % - o [dseries] -% Copyright © 2011-2021 Dynare Team +% Copyright © 2011-2023 Dynare Team % % This file is part of Dynare. % @@ -28,7 +28,7 @@ function o = log(o) % --*-- Unitary tests --*-- o = copy(o); o.log_; -return +return % --*-- Unit tests --*-- %@test:1 % Define a dates object @@ -79,4 +79,4 @@ if t(1) end T = all(t); -%@eof:2 \ No newline at end of file +%@eof:2 diff --git a/src/@dseries/log_.m b/src/@dseries/log_.m index ad35952e7d29a2f37d77d3d7518979eab7bc3e04..6379c69577714364633e54922fc100a41df7edf8 100644 --- a/src/@dseries/log_.m +++ b/src/@dseries/log_.m @@ -1,4 +1,4 @@ -function o = log_(o) % --*-- Unitary tests --*-- +function o = log_(o) % Apply the logarithm to all the variables in a dseries object (in place modification). % @@ -8,7 +8,7 @@ function o = log_(o) % --*-- Unitary tests --*-- % OUTPUTS % - o [dseries] -% Copyright © 2011-2021 Dynare Team +% Copyright © 2011-2023 Dynare Team % % This file is part of Dynare. % @@ -38,7 +38,7 @@ for i=1:vobs(o) end end -return +return % --*-- Unit tests --*-- %@test:1 % Define a dates object @@ -96,4 +96,4 @@ if t(1) end T = all(t); -%@eof:2 \ No newline at end of file +%@eof:2 diff --git a/src/@dseries/lt.m b/src/@dseries/lt.m index e7fe5115c4bf4f9129e7f6eb055dabe843929fa9..c42abab8934adf26cc15224a208e6eff8b5c91ad 100644 --- a/src/@dseries/lt.m +++ b/src/@dseries/lt.m @@ -1,8 +1,8 @@ -function l = lt(varargin) % --*-- Unitary tests --*-- +function l = lt(varargin) % Overloads the < operator for dseries objects. -% Copyright © 2021 Dynare Team +% Copyright © 2021-2023 Dynare Team % % This code is free software: you can redistribute it and/or modify % it under the terms of the GNU General Public License as published by @@ -25,4 +25,4 @@ elseif isdseries(varargin{1}) && isdseries(varargin{2}) l = varargin{1}.data<varargin{2}.data; else error('dseries::lt: wrong types.') -end \ No newline at end of file +end diff --git a/src/@dseries/mdiff.m b/src/@dseries/mdiff.m index ccbb1254adb2d53fae226aa2fd8958ba4548b118..ec26df4f7e774e47888e729de75c934a73968a07 100644 --- a/src/@dseries/mdiff.m +++ b/src/@dseries/mdiff.m @@ -1,4 +1,4 @@ -function o = mdiff(o) % --*-- Unitary tests --*-- +function o = mdiff(o) % Computes monthly differences. % @@ -8,7 +8,7 @@ function o = mdiff(o) % --*-- Unitary tests --*-- % OUTPUTS % - o [dseries] -% Copyright © 2017-2021 Dynare Team +% Copyright © 2017-2023 Dynare Team % % This file is part of Dynare. % @@ -28,7 +28,7 @@ function o = mdiff(o) % --*-- Unitary tests --*-- o = copy(o); o.mdiff_(); -return +return % --*-- Unit tests --*-- %@test:1 try @@ -48,4 +48,4 @@ if t(1) end T = all(t); -%@eof:1 \ No newline at end of file +%@eof:1 diff --git a/src/@dseries/mdiff_.m b/src/@dseries/mdiff_.m index 2c621474a89f709e3d63a3a3b63300a034def13f..381e21c24ca3db38f56b2935ea60ef959c001167 100644 --- a/src/@dseries/mdiff_.m +++ b/src/@dseries/mdiff_.m @@ -1,4 +1,4 @@ -function o = mdiff_(o) % --*-- Unitary tests --*-- +function o = mdiff_(o) % Computes monthly differences. % @@ -8,7 +8,7 @@ function o = mdiff_(o) % --*-- Unitary tests --*-- % OUTPUTS % - o [dseries] -% Copyright © 2017-2021 Dynare Team +% Copyright © 2017-2023 Dynare Team % % This file is part of Dynare. % @@ -51,7 +51,7 @@ for i = 1:vobs(o) end end -return +return % --*-- Unit tests --*-- %@test:1 try diff --git a/src/@dseries/mean.m b/src/@dseries/mean.m index e4ecb878bf883dc503960c061165253de98d2085..520f54f2bff5183db1075bde6d8164c2b9ddd4a3 100644 --- a/src/@dseries/mean.m +++ b/src/@dseries/mean.m @@ -1,4 +1,4 @@ -function m = mean(o, geometric) % --*-- Unitary tests --*-- +function m = mean(o, geometric) % Returns the mean of the variables in a @dseries object o. % @@ -9,7 +9,7 @@ function m = mean(o, geometric) % --*-- Unitary tests --*-- % OUTPUTS % o m 1*vobs(o) vector of doubles. -% Copyright © 2016-2021 Dynare Team +% Copyright © 2016-2023 Dynare Team % % This file is part of Dynare. % @@ -36,7 +36,7 @@ else m = mean(o.data); end -return +return % --*-- Unit tests --*-- %@test:1 % Define a dataset. @@ -126,4 +126,4 @@ if t(1) t(7) = isequal(m1, m3); end T = all(t); -%@eof:4 \ No newline at end of file +%@eof:4 diff --git a/src/@dseries/merge.m b/src/@dseries/merge.m index dab0d99f58b479a1e35d4c1fa100620c56dd4f89..566946dcf4790c474ea0e83330a1089c0b02acee 100644 --- a/src/@dseries/merge.m +++ b/src/@dseries/merge.m @@ -1,11 +1,11 @@ -function q = merge(o, p, legacy) % --*-- Unitary tests --*-- +function q = merge(o, p, legacy) % Merge method for dseries objects. % % INPUTS % - o [dseries] % - p [dseries] -% - legacy [logical] revert to legacy behaviour if `true` (default is `false`), +% - legacy [logical] revert to legacy behaviour if `true` (default is `false`), % % OUTPUTS % - q [dseries] @@ -15,7 +15,7 @@ function q = merge(o, p, legacy) % --*-- Unitary tests --*-- % in p take precedence except if p has NaNs (the exception can be % removed by setting the third argument, legacy, equal to true). -% Copyright © 2013-2021 Dynare Team +% Copyright © 2013-2023 Dynare Team % % This file is part of Dynare. % @@ -153,7 +153,7 @@ end q.dates = q_init:q_init+(nobs(q)-1); -return +return % --*-- Unit tests --*-- %@test:1 % Define a datasets. @@ -283,4 +283,4 @@ if t(1) t(6) = dassert(y.dates(1), z.dates(1)); end T = all(t); -%@eof:5 \ No newline at end of file +%@eof:5 diff --git a/src/@dseries/mgrowth.m b/src/@dseries/mgrowth.m index e0ecf8c202a06dc34aef4aa993b40d4f8a1a6215..82a87b37eb4659b8016caa31ab55901709f84f8c 100644 --- a/src/@dseries/mgrowth.m +++ b/src/@dseries/mgrowth.m @@ -1,4 +1,4 @@ -function o = mgrowth(o) % --*-- Unitary tests --*-- +function o = mgrowth(o) % Computes monthly growth rates. % @@ -8,7 +8,7 @@ function o = mgrowth(o) % --*-- Unitary tests --*-- % OUTPUTS % - o [dseries] -% Copyright © 2017-2021 Dynare Team +% Copyright © 2017-2023 Dynare Team % % This file is part of Dynare. % @@ -28,7 +28,7 @@ function o = mgrowth(o) % --*-- Unitary tests --*-- o = copy(o); o.mgrowth_(); -return +return % --*-- Unit tests --*-- %@test:1 try @@ -48,4 +48,4 @@ if t(1) end T = all(t); -%@eof:1 \ No newline at end of file +%@eof:1 diff --git a/src/@dseries/mgrowth_.m b/src/@dseries/mgrowth_.m index e11c6d3b1fe6b41b416b94d2677b09ce0a065529..9d5daa7a91c192e30f08606905351a8982517dd7 100644 --- a/src/@dseries/mgrowth_.m +++ b/src/@dseries/mgrowth_.m @@ -1,4 +1,4 @@ -function o = mgrowth_(o) % --*-- Unitary tests --*-- +function o = mgrowth_(o) % Computes monthly growth rates. % @@ -8,7 +8,7 @@ function o = mgrowth_(o) % --*-- Unitary tests --*-- % OUTPUTS % - o [dseries] -% Copyright © 2017-2021 Dynare Team +% Copyright © 2017-2023 Dynare Team % % This file is part of Dynare. % @@ -51,7 +51,7 @@ for i = 1:vobs(o) end end -return +return % --*-- Unit tests --*-- %@test:1 try diff --git a/src/@dseries/minus.m b/src/@dseries/minus.m index 1c88fc66291ee952c863fb37e3e6a20a942ea200..b7412fbd658ce965cb3d364b15d18f94c6a27b6e 100644 --- a/src/@dseries/minus.m +++ b/src/@dseries/minus.m @@ -1,4 +1,4 @@ -function q = minus(o, p) % --*-- Unitary tests --*-- +function q = minus(o, p) % Overloads the minus operator for dseries objects. % @@ -27,7 +27,7 @@ function q = minus(o, p) % --*-- Unitary tests --*-- % 4Y | 0 % 5Y | 0 -% Copyright © 2012-2021 Dynare Team +% Copyright © 2012-2023 Dynare Team % % This file is part of Dynare. % @@ -169,7 +169,7 @@ end q.data = bsxfun(@minus, o.data, p.data); -return +return % --*-- Unit tests --*-- %@test:1 % Define a datasets. diff --git a/src/@dseries/mpower.m b/src/@dseries/mpower.m index 1b056107ea6a02e7c4540c48f6e9be2465eb6fe3..43b1f8af928e613b3519c664e48e5164f0e64b61 100644 --- a/src/@dseries/mpower.m +++ b/src/@dseries/mpower.m @@ -1,4 +1,4 @@ -function q = mpower(o, p) % --*-- Unitary tests --*-- +function q = mpower(o, p) % Overloads the power (^) operator for dseries objects. % @@ -9,7 +9,7 @@ function q = mpower(o, p) % --*-- Unitary tests --*-- % OUTPUTS % - q [dseries] T observations and N variables. -% Copyright © 2013-2021 Dynare Team +% Copyright © 2013-2023 Dynare Team % % This file is part of Dynare. % @@ -88,7 +88,7 @@ end error('dseries:WrongInputArguments', 'Wrong calling sequence! Please check the manual.') -return +return % --*-- Unit tests --*-- %@test:1 % Define a datasets. @@ -168,4 +168,4 @@ if t(1) t(6) = dassert(ts2.tex,{'MyVar1';'MyVar2'}); end T = all(t); -%@eof:3 \ No newline at end of file +%@eof:3 diff --git a/src/@dseries/mrdivide.m b/src/@dseries/mrdivide.m index 972c906967ca0ada28bfafbb57f6f97247a72a21..ca29a1b43732f98752b0eef078e4310800b713be 100644 --- a/src/@dseries/mrdivide.m +++ b/src/@dseries/mrdivide.m @@ -1,4 +1,4 @@ -function q = mrdivide(o, p) % --*-- Unitary tests --*-- +function q = mrdivide(o, p) % Overloads the mrdivde (/) operator for dseries objects. % @@ -9,7 +9,7 @@ function q = mrdivide(o, p) % --*-- Unitary tests --*-- % OUTPUTS % - q [dseries] T observations and N variables. -% Copyright © 2013-2021 Dynare Team +% Copyright © 2013-2023 Dynare Team % % This file is part of Dynare. % @@ -121,7 +121,7 @@ else error() end -return +return % --*-- Unit tests --*-- %@test:1 % Define a datasets. diff --git a/src/@dseries/mtimes.m b/src/@dseries/mtimes.m index 43307dbbf576440f3a994b7f7f114a2d0f2100e6..d1edade9f9e8e96214c953d9294beeb5b679df22 100644 --- a/src/@dseries/mtimes.m +++ b/src/@dseries/mtimes.m @@ -1,4 +1,4 @@ -function q = mtimes(o, p) % --*-- Unitary tests --*-- +function q = mtimes(o, p) % Overloads the mtimes (*) operator for dseries objects. % @@ -9,7 +9,7 @@ function q = mtimes(o, p) % --*-- Unitary tests --*-- % OUTPUTS % - q [dseries] T observations and N variables. -% Copyright © 2013-2021 Dynare Team +% Copyright © 2013-2023 Dynare Team % % This file is part of Dynare. % @@ -133,7 +133,7 @@ else error() end -return +return % --*-- Unit tests --*-- %@test:1 % Define a datasets. diff --git a/src/@dseries/nanmean.m b/src/@dseries/nanmean.m index dd21abf49b2cd5ea89ce29cbe2aec6899a5db31b..368f6bcbe61a998d9ca03d06f19212a95c4fff12 100644 --- a/src/@dseries/nanmean.m +++ b/src/@dseries/nanmean.m @@ -1,4 +1,4 @@ -function m = nanmean(o, geometric) % --*-- Unitary tests --*-- +function m = nanmean(o, geometric) % Returns the mean of the variables in a @dseries object o (robust % to the presence of NaNs). @@ -10,7 +10,7 @@ function m = nanmean(o, geometric) % --*-- Unitary tests --*-- % OUTPUTS % - m 1*vobs(o) vector of doubles. -% Copyright © 2019-2021 Dynare Team +% Copyright © 2019-2023 Dynare Team % % This file is part of Dynare. % @@ -41,7 +41,7 @@ else m = nanmean(o.data); end -return +return % --*-- Unit tests --*-- %@test:1 % Define a dataset. @@ -83,4 +83,4 @@ if t(1) t(3) = dassert(m, [sqrt(3), 0]); end T = all(t); -%@eof:2 \ No newline at end of file +%@eof:2 diff --git a/src/@dseries/nanstd.m b/src/@dseries/nanstd.m index 757417b0144646c63e440906dc9f7e80fe71fced..31042f2b9e390bcb9f04bf2096c6be3078e97868 100644 --- a/src/@dseries/nanstd.m +++ b/src/@dseries/nanstd.m @@ -1,4 +1,4 @@ -function s = nanstd(o, geometric) % --*-- Unitary tests --*-- +function s = nanstd(o, geometric) % Returns the standard deviation of the variables in a @dseries object o (robust % to the presence of NaNs). @@ -13,7 +13,7 @@ function s = nanstd(o, geometric) % --*-- Unitary tests --*-- % REMARKS % See https://en.wikipedia.org/wiki/Geometric_standard_deviation for the definition of the geometric standard deviation. -% Copyright © 2020-2021 Dynare Team +% Copyright © 2020-2023 Dynare Team % % This file is part of Dynare. % @@ -49,7 +49,7 @@ else end end -return +return % --*-- Unit tests --*-- %@test:1 % Define a dataset. @@ -71,4 +71,4 @@ if t(1) t(3) = all(abs(s-ones(1, 2))<1e-3); end T = all(t); -%@eof:1 \ No newline at end of file +%@eof:1 diff --git a/src/@dseries/ne.m b/src/@dseries/ne.m index 9d14706413c0ee358571fb1be0a89e82d2b87b47..1bad95a44e24cd9a79bad28db2ac9e8516d2512f 100644 --- a/src/@dseries/ne.m +++ b/src/@dseries/ne.m @@ -1,4 +1,4 @@ -function b = ne(o, p) % --*-- Unitary tests --*-- +function b = ne(o, p) % Overloads ne (~=) operator. % @@ -12,7 +12,7 @@ function b = ne(o, p) % --*-- Unitary tests --*-- % REMARKS % If the number of variables, the number of observations or the frequencies are different in A and B, the function returns one. -% Copyright © 2013-2021 Dynare Team +% Copyright © 2013-2023 Dynare Team % % This file is part of Dynare. % @@ -75,7 +75,7 @@ end b = ne(o.data, p.data); -return +return % --*-- Unit tests --*-- %@test:1 % Define a datasets. @@ -103,4 +103,4 @@ if t(1) t(2) = dassert(a,logical([ones(10,2), ones(10,1)])); end T = all(t); -%@eof:1 \ No newline at end of file +%@eof:1 diff --git a/src/@dseries/onesidedhpcycle.m b/src/@dseries/onesidedhpcycle.m index 43daf898dc332f8950b069799f782958e1c28778..51d80f082b6c15edea8a564ca87e9e9fabb3bf92 100644 --- a/src/@dseries/onesidedhpcycle.m +++ b/src/@dseries/onesidedhpcycle.m @@ -1,4 +1,4 @@ -function o = onesidedhpcycle(o, lambda, init) % --*-- Unitary tests --*-- +function o = onesidedhpcycle(o, lambda, init) % Extracts the cycle component from a dseries object using the one sided HP filter. % @@ -9,7 +9,7 @@ function o = onesidedhpcycle(o, lambda, init) % --*-- Unitary tests --*-- % OUTPUTS % - o [dseries] Cycle component of the original time series. -% Copyright © 2017 Dynare Team +% Copyright © 2017-2023 Dynare Team % % This file is part of Dynare. % @@ -46,7 +46,7 @@ else o.onesidedhpcycle_(lambda, init); end -return +return % --*-- Unit tests --*-- %@test:1 d = randn(100,1); @@ -64,4 +64,4 @@ if t(1) end T = all(t); -%@eof:1 \ No newline at end of file +%@eof:1 diff --git a/src/@dseries/onesidedhpcycle_.m b/src/@dseries/onesidedhpcycle_.m index 0cc1dab821353203e4089df0f05b70be7efc491d..3194ac276ec47fe73823291300c1917b95307006 100644 --- a/src/@dseries/onesidedhpcycle_.m +++ b/src/@dseries/onesidedhpcycle_.m @@ -1,4 +1,4 @@ -function o = onesidedhpcycle_(o, lambda, init) % --*-- Unitary tests --*-- +function o = onesidedhpcycle_(o, lambda, init) % Extracts the cycle component from a dseries object using a one sided HP filter. % @@ -9,7 +9,7 @@ function o = onesidedhpcycle_(o, lambda, init) % --*-- Unitary tests --*-- % OUTPUTS % - o [dseries] Cycle component of the original time series. -% Copyright © 2017 Dynare Team +% Copyright © 2017-2023 Dynare Team % % This file is part of Dynare. % @@ -75,11 +75,11 @@ if nargin>2 trend = o.hptrend(lambda); x0 = trend.data(1:2,:); [~, o.data] = one_sided_hp_filter(o.data, lambda, x0); -else +else [~, o.data] = one_sided_hp_filter(o.data, lambda); end -return +return % --*-- Unit tests --*-- %@test:1 e = .2*randn(200,1); @@ -124,4 +124,4 @@ catch end T = all(t); -%@eof:2 \ No newline at end of file +%@eof:2 diff --git a/src/@dseries/onesidedhptrend.m b/src/@dseries/onesidedhptrend.m index 75a82ca36d1dab89805284222c9b2987016f08b0..3c38a77b3bdc733452d599a5d1fdb496cab50d77 100644 --- a/src/@dseries/onesidedhptrend.m +++ b/src/@dseries/onesidedhptrend.m @@ -1,4 +1,4 @@ -function o = onesidedhptrend(o, lambda, init) % --*-- Unitary tests --*-- +function o = onesidedhptrend(o, lambda, init) % Extracts the trend component from a dseries object using the one sided HP filter. % @@ -9,7 +9,7 @@ function o = onesidedhptrend(o, lambda, init) % --*-- Unitary tests --*-- % OUTPUTS % - o [dseries] Trend component of the original time series. -% Copyright © 2017 Dynare Team +% Copyright © 2017-2023 Dynare Team % % This file is part of Dynare. % @@ -46,7 +46,7 @@ else o.onesidedhptrend_(lambda, init); end -return +return % --*-- Unit tests --*-- %@test:1 d = randn(100,1); @@ -64,4 +64,4 @@ if t(1) end T = all(t); -%@eof:1 \ No newline at end of file +%@eof:1 diff --git a/src/@dseries/onesidedhptrend_.m b/src/@dseries/onesidedhptrend_.m index 38458c6cead3bc8ec5a2e1b1a549430185b2927b..71890c003f78ed7250800ce220edeb241e5cb0a5 100644 --- a/src/@dseries/onesidedhptrend_.m +++ b/src/@dseries/onesidedhptrend_.m @@ -1,4 +1,4 @@ -function o = onesidedhptrend_(o, lambda) % --*-- Unitary tests --*-- +function o = onesidedhptrend_(o, lambda) % Extracts the trend component from a dseries object using a one sided HP filter. % @@ -9,7 +9,7 @@ function o = onesidedhptrend_(o, lambda) % --*-- Unitary tests --*-- % OUTPUTS % - o [dseries] Trend component of the original time series. -% Copyright © 2017 Dynare Team +% Copyright © 2017-2023 Dynare Team % % This file is part of Dynare. % @@ -75,11 +75,11 @@ if nargin>2 trend = o.hptrend(lambda); x0 = trend.data(1:2,:); o.data = one_sided_hp_filter(o.data, lambda, x0); -else +else o.data = one_sided_hp_filter(o.data, lambda); end -return +return % --*-- Unit tests --*-- %@test:1 e = .2*randn(200,1); @@ -124,4 +124,4 @@ catch end T = all(t); -%@eof:2 \ No newline at end of file +%@eof:2 diff --git a/src/@dseries/plus.m b/src/@dseries/plus.m index 5f65892c0757993c3b0d7fbd9554964840e3b244..0b995df8aeb7e65bfccb5936a6c098c0d12c5f9d 100644 --- a/src/@dseries/plus.m +++ b/src/@dseries/plus.m @@ -1,4 +1,4 @@ -function q = plus(o, p) % --*-- Unitary tests --*-- +function q = plus(o, p) % Overloads the plus (+) operator for dseries objects. % @@ -9,7 +9,7 @@ function q = plus(o, p) % --*-- Unitary tests --*-- % OUTPUTS % - q [dseries] -% Copyright © 2011-2021 Dynare Team +% Copyright © 2011-2023 Dynare Team % % This file is part of Dynare. % @@ -109,11 +109,11 @@ if isdseries(o) && isdseries(p) idp = ido; end end - + if ~isequal(frequency(o),frequency(p)) error(['dseries::plus: Cannot add ' inputname(1) ' and ' inputname(2) ' (frequencies are different)!']) end - + if ~isequal(nobs(o), nobs(p)) || ~isequal(firstdate(o),firstdate(p)) [o, p] = align(o, p); end @@ -142,7 +142,7 @@ else error() end -return +return % --*-- Unit tests --*-- %@test:1 % Define a datasets. diff --git a/src/@dseries/pop.m b/src/@dseries/pop.m index e6ab629692ca397945e0be346843528df5b75e75..6b616b4a49fed549da07f095cedff711664a3740 100644 --- a/src/@dseries/pop.m +++ b/src/@dseries/pop.m @@ -1,4 +1,4 @@ -function [o, id] = pop(o, a) % --*-- Unitary tests --*-- +function [o, id] = pop(o, a) % Removes a variable from a dseries object. % @@ -9,7 +9,7 @@ function [o, id] = pop(o, a) % --*-- Unitary tests --*-- % OUTPUTS % - o [dseries] T observations and N-1 variables. -% Copyright © 2013-2021 Dynare Team +% Copyright © 2013-2023 Dynare Team % % This file is part of Dynare. % @@ -34,7 +34,7 @@ else [o, id] = pop_(o, a); end -return +return % --*-- Unit tests --*-- %@test:1 % Define a datasets. diff --git a/src/@dseries/pop_.m b/src/@dseries/pop_.m index 68f4151ae8056f3d6471c6be6aae13f103a2d0b3..817f2502764ca1674e80037968e90c1fd7e1bb12 100644 --- a/src/@dseries/pop_.m +++ b/src/@dseries/pop_.m @@ -1,4 +1,4 @@ -function [o, id] = pop_(o, a) % --*-- Unitary tests --*-- +function [o, id] = pop_(o, a) % Removes a variable from a dseries object. % @@ -9,7 +9,7 @@ function [o, id] = pop_(o, a) % --*-- Unitary tests --*-- % OUTPUTS % - o [dseries] T observations and N-1 variables. -% Copyright © 2013-2021 Dynare Team +% Copyright © 2013-2023 Dynare Team % % This file is part of Dynare. % @@ -44,10 +44,10 @@ o.tex(id) = []; o.ops(id) = []; otagnames = fieldnames(o.tags); for i=1:length(otagnames) - o.tags.(otagnames{i})(id) = []; + o.tags.(otagnames{i})(id) = []; end -return +return % --*-- Unit tests --*-- %@test:1 % Define a datasets. @@ -76,4 +76,4 @@ if t(1) t(5) = dassert(ts1.tags.type, {1;3}); end T = all(t); -%@eof:1 \ No newline at end of file +%@eof:1 diff --git a/src/@dseries/projection.m b/src/@dseries/projection.m index ef038b7b0170d8366b1b3e48eebc5ab19bdee0ae..520361efc6283f3736d9d611f803ca03e30af2d1 100644 --- a/src/@dseries/projection.m +++ b/src/@dseries/projection.m @@ -1,4 +1,4 @@ -function o = projection(o, info, periods) % --*-- Unitary tests --*-- +function o = projection(o, info, periods) % Projects variables in dseries object o. % @@ -31,6 +31,23 @@ function o = projection(o, info, periods) % --*-- Unitary tests --*-- % or 'AR' with an autoregressive parameter equal to one (random walk). % [4] This projection routine only deals with exponential trends. +% Copyright © 2022-2023 Dynare Team +% +% This file is part of Dynare. +% +% Dynare is free software: you can redistribute it and/or modify +% it under the terms of the GNU General Public License as published by +% the Free Software Foundation, either version 3 of the License, or +% (at your option) any later version. +% +% Dynare is distributed in the hope that it will be useful, +% but WITHOUT ANY WARRANTY; without even the implied warranty of +% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +% GNU General Public License for more details. +% +% You should have received a copy of the GNU General Public License +% along with Dynare. If not, see <https://www.gnu.org/licenses/>. + % Fetch useful lines in info [~, ~, i2] = intersect(o.name, info(:,1)); INFO = info(i2,:); @@ -70,7 +87,7 @@ for i=1:rows(INFO) end end -return +return % --*-- Unit tests --*-- %@test:1 try @@ -91,4 +108,4 @@ if t(1) t(6) = dassert(ts.A4.data(11), 0.2, 1e-15) & dassert(ts.A4.data(12), 0.2*0.4-0.2, 1e-15); end T = all(t); -%@eof:1 \ No newline at end of file +%@eof:1 diff --git a/src/@dseries/qdiff.m b/src/@dseries/qdiff.m index d6d5074982bb6867ef8538baa6cd53bcd8b691fc..bf060c8275e707ccf0365c4b8afa70065375ce1a 100644 --- a/src/@dseries/qdiff.m +++ b/src/@dseries/qdiff.m @@ -1,4 +1,4 @@ -function o = qdiff(o) % --*-- Unitary tests --*-- +function o = qdiff(o) % Computes quaterly differences. % @@ -8,7 +8,7 @@ function o = qdiff(o) % --*-- Unitary tests --*-- % OUTPUTS % - o [dseries] -% Copyright © 2012-2021 Dynare Team +% Copyright © 2012-2023 Dynare Team % % This file is part of Dynare. % @@ -28,7 +28,7 @@ function o = qdiff(o) % --*-- Unitary tests --*-- o = copy(o); o.qdiff_(); -return +return % --*-- Unit tests --*-- %@test:1 try @@ -48,4 +48,4 @@ if t(1) end T = all(t); -%@eof:1 \ No newline at end of file +%@eof:1 diff --git a/src/@dseries/qdiff_.m b/src/@dseries/qdiff_.m index a65fafc526add95916600d36e96a71a53af17538..10d15439370404e8fab891a32a339a7b9ae73c60 100644 --- a/src/@dseries/qdiff_.m +++ b/src/@dseries/qdiff_.m @@ -1,4 +1,4 @@ -function o = qdiff_(o) % --*-- Unitary tests --*-- +function o = qdiff_(o) % Computes quaterly differences. % @@ -8,7 +8,7 @@ function o = qdiff_(o) % --*-- Unitary tests --*-- % OUTPUTS % - o [dseries] -% Copyright © 2012-2021 Dynare Team +% Copyright © 2012-2023 Dynare Team % % This file is part of Dynare. % @@ -52,7 +52,7 @@ for i = 1:vobs(o) end end -return +return % --*-- Unit tests --*-- %@test:1 try diff --git a/src/@dseries/qgrowth.m b/src/@dseries/qgrowth.m index c4c380b092b49dc819b8722845f06534b67a78c2..9f8e79a392f23edf30797cc0b5a14062b314b0f4 100644 --- a/src/@dseries/qgrowth.m +++ b/src/@dseries/qgrowth.m @@ -1,4 +1,4 @@ -function o = qgrowth(o) % --*-- Unitary tests --*-- +function o = qgrowth(o) % Computes quaterly growth rates. % @@ -8,7 +8,7 @@ function o = qgrowth(o) % --*-- Unitary tests --*-- % OUTPUTS % - o [dseries] -% Copyright © 2012-2021 Dynare Team +% Copyright © 2012-2023 Dynare Team % % This file is part of Dynare. % @@ -28,7 +28,7 @@ function o = qgrowth(o) % --*-- Unitary tests --*-- o = copy(o); o.qgrowth_(); -return +return % --*-- Unit tests --*-- %@test:1 try @@ -48,4 +48,4 @@ if t(1) end T = all(t); -%@eof:1 \ No newline at end of file +%@eof:1 diff --git a/src/@dseries/qgrowth_.m b/src/@dseries/qgrowth_.m index 6aa03ba7ff4975705e203096f44bd936af351b3b..78aff69f7831843ac38036b0fa2501951125da71 100644 --- a/src/@dseries/qgrowth_.m +++ b/src/@dseries/qgrowth_.m @@ -1,4 +1,4 @@ -function o = qgrowth_(o) % --*-- Unitary tests --*-- +function o = qgrowth_(o) % Computes quaterly growth rates. % @@ -8,7 +8,7 @@ function o = qgrowth_(o) % --*-- Unitary tests --*-- % OUTPUTS % - o [dseries] -% Copyright © 2012-2021 Dynare Team +% Copyright © 2012-2023 Dynare Team % % This file is part of Dynare. % @@ -52,7 +52,7 @@ for i = 1:vobs(o) end end -return +return % --*-- Unit tests --*-- %@test:1 try diff --git a/src/@dseries/remove.m b/src/@dseries/remove.m index 0739e06673dd4d72fdc1132ccaffcb4f4e2201cb..738c9f01e62c1b4a935943cfcc1e0cf324a0c3d6 100644 --- a/src/@dseries/remove.m +++ b/src/@dseries/remove.m @@ -1,8 +1,8 @@ -function o = remove(o, a) % --*-- Unitary tests --*-- +function o = remove(o, a) % Removes a variable from a dseries object (alias for the pop method). -% Copyright © 2014-2017 Dynare Team +% Copyright © 2014-2023 Dynare Team % % This file is part of Dynare. % @@ -19,4 +19,4 @@ function o = remove(o, a) % --*-- Unitary tests --*-- % You should have received a copy of the GNU General Public License % along with Dynare. If not, see <https://www.gnu.org/licenses/>. -o = pop(o, a); \ No newline at end of file +o = pop(o, a); diff --git a/src/@dseries/remove_.m b/src/@dseries/remove_.m index 474ccecabd64f1e3f39a7adf6a4cb95904172460..50e9c8ace28397614d1da32c937cea677f85d029 100644 --- a/src/@dseries/remove_.m +++ b/src/@dseries/remove_.m @@ -1,8 +1,8 @@ -function o = remove_(o, a) % --*-- Unitary tests --*-- +function o = remove_(o, a) % Removes a variable from a dseries object (alias for the pop_ method). -% Copyright © 2017 Dynare Team +% Copyright © 2017-2023 Dynare Team % % This file is part of Dynare. % @@ -19,4 +19,4 @@ function o = remove_(o, a) % --*-- Unitary tests --*-- % You should have received a copy of the GNU General Public License % along with Dynare. If not, see <https://www.gnu.org/licenses/>. -o = pop_(o, a); \ No newline at end of file +o = pop_(o, a); diff --git a/src/@dseries/rename.m b/src/@dseries/rename.m index d0f71a927dfb33215f568ca3f5b673b8ae949d5b..b541d94cc770b775c8ec0ea7eb8a5bfda2e12c31 100644 --- a/src/@dseries/rename.m +++ b/src/@dseries/rename.m @@ -1,4 +1,4 @@ -function o = rename(o, old, new) % --*-- Unitary tests --*-- +function o = rename(o, old, new) % Renames variables in a dseries object. % @@ -10,7 +10,7 @@ function o = rename(o, old, new) % --*-- Unitary tests --*-- % OUTPUTS % - o [dseries] -% Copyright © 2013-2021 Dynare Team +% Copyright © 2013-2023 Dynare Team % % This file is part of Dynare. % @@ -34,7 +34,7 @@ else o.rename_(old, new); end -return +return % --*-- Unit tests --*-- %@test:1 ts = dseries([transpose(1:5), transpose(6:10)],'1950q1',{'Output'; 'Consumption'}, {'Y_t'; 'C_t'}); @@ -72,4 +72,4 @@ if t(1) end T = all(t); -%@eof:2 \ No newline at end of file +%@eof:2 diff --git a/src/@dseries/rename_.m b/src/@dseries/rename_.m index 794d4a6aa925379e53be12b4472e64e1cf0af36e..96f630190d1c66138aa5b2a5c7b07c8f3218c617 100644 --- a/src/@dseries/rename_.m +++ b/src/@dseries/rename_.m @@ -1,4 +1,4 @@ -function o = rename_(o, old, new) % --*-- Unitary tests --*-- +function o = rename_(o, old, new) % Renames variables in a dseries object. % @@ -10,7 +10,7 @@ function o = rename_(o, old, new) % --*-- Unitary tests --*-- % OUTPUTS % - o [dseries] -% Copyright © 2013-2021 Dynare Team +% Copyright © 2013-2023 Dynare Team % % This file is part of Dynare. % @@ -83,7 +83,7 @@ else o.name(idname) = {new}; end -return +return % --*-- Unit tests --*-- %@test:1 ts = dseries([transpose(1:5), transpose(6:10)],'1950q1',{'Output'; 'Consumption'}, {'Y_t'; 'C_t'}); diff --git a/src/@dseries/round.m b/src/@dseries/round.m index 509bd1f537c4a62b190be48019aa4b2f450716b7..d1b2411c3aa652b52d56e37366c1ce1fd513ed2f 100644 --- a/src/@dseries/round.m +++ b/src/@dseries/round.m @@ -1,4 +1,4 @@ -function o = round(o, n) % --*-- Unitary tests --*-- +function o = round(o, n) % Rounds to nearest decimal or integer. % @@ -9,7 +9,7 @@ function o = round(o, n) % --*-- Unitary tests --*-- % OUTPUTS % - o [dseries] -% Copyright © 2020-2021 Dynare Team +% Copyright © 2020-2023 Dynare Team % % This file is part of Dynare. % @@ -33,7 +33,7 @@ end o = copy(o); o.round_(n); -return +return % --*-- Unit tests --*-- %@test:1 % Define a dates object @@ -54,4 +54,4 @@ if t(1) end T = all(t); -%@eof:1 \ No newline at end of file +%@eof:1 diff --git a/src/@dseries/round_.m b/src/@dseries/round_.m index d6389e25d62edad1f2be9ccf2b2acc9e194cc943..1a6be10b4a0936fcaa7a2d63645c6ec25f6497eb 100644 --- a/src/@dseries/round_.m +++ b/src/@dseries/round_.m @@ -1,4 +1,4 @@ -function o = round_(o, n) % --*-- Unitary tests --*-- +function o = round_(o, n) % Rounds to nearest decimal or integer. % @@ -9,7 +9,7 @@ function o = round_(o, n) % --*-- Unitary tests --*-- % OUTPUTS % - o [dseries] -% Copyright © 2020-2021 Dynare Team +% Copyright © 2020-2023 Dynare Team % % This file is part of Dynare. % @@ -44,7 +44,7 @@ else o.data = round(o.data, n); end -return +return % --*-- Unit tests --*-- %@test:1 % Define a dates object @@ -64,4 +64,4 @@ if t(1) end T = all(t); -%@eof:1 \ No newline at end of file +%@eof:1 diff --git a/src/@dseries/save.m b/src/@dseries/save.m index 253e3723328dd093a1d6a25ce0310370fc464c81..5977476e3586c888ef5c6696b98135ff6e4dc8ed 100644 --- a/src/@dseries/save.m +++ b/src/@dseries/save.m @@ -1,8 +1,8 @@ -function save(o, basename, format) % --*-- Unitary tests --*-- +function save(o, basename, format) % Saves a dseries object on disk. -% Copyright © 2013-2021 Dynare Team +% Copyright © 2013-2023 Dynare Team % % This file is part of Dynare. % @@ -128,7 +128,7 @@ switch format error('Unknown format!') end -return +return % --*-- Unit tests --*-- %@test:1 % Define a data set. @@ -212,4 +212,4 @@ end delete('dynare_series.mat'); T = all(t); -%@eof:4 \ No newline at end of file +%@eof:4 diff --git a/src/@dseries/set_names.m b/src/@dseries/set_names.m index 8ac5b80d84f9ead50f044ebd8807dcbc78f4a8e8..db2f7020aba3d28444892260a691916ef8ab8186 100644 --- a/src/@dseries/set_names.m +++ b/src/@dseries/set_names.m @@ -1,4 +1,4 @@ -function o = set_names(o, varargin) % --*-- Unitary tests --*-- +function o = set_names(o, varargin) % Specifies names of the variables in a dseries object (in place modification). % @@ -9,7 +9,7 @@ function o = set_names(o, varargin) % --*-- Unitary tests --*-- % OUTPUTS % - o [dseries] -% Copyright © 2017-2021 Dynare Team +% Copyright © 2017-2023 Dynare Team % % This file is part of Dynare. % @@ -50,7 +50,7 @@ for i=1:vobs(o) end end -return +return % --*-- Unit tests --*-- %@test:1 % Define a datasets. @@ -76,4 +76,4 @@ if length(t)>1 t(4) = dassert(ts1.name,A_name); end T = all(t); -%@eof:1 \ No newline at end of file +%@eof:1 diff --git a/src/@dseries/size.m b/src/@dseries/size.m index caa5a85df89565a9c173bb1cf4d7a17a6f7ebbf3..197e40a819b832ef72b8f5b4c014d0aed3e95a03 100644 --- a/src/@dseries/size.m +++ b/src/@dseries/size.m @@ -1,8 +1,8 @@ -function varargout = size(o, varargin) % --*-- Unitary tests --*-- +function varargout = size(o, varargin) % Overloads size function. -% Copyright © 2013-2021 Dynare Team +% Copyright © 2013-2023 Dynare Team % % This file is part of Dynare. % @@ -35,9 +35,9 @@ switch nargout error('dseries::size: Wrong calling sequence! Cannot return more than two arguments.') end -return +return % --*-- Unit tests --*-- -%@test:2 +%@test:1 ts = dseries(randn(10,1)); try dimension = ts.size(); @@ -52,4 +52,4 @@ if t(1) end T = all(t); -%@eof:2 \ No newline at end of file +%@eof:1 diff --git a/src/@dseries/std.m b/src/@dseries/std.m index 85692ef942d37fa91238c571af82bf3c34a0506f..695013f9c93ec183d76f8e1169f03bc85ecd8f7c 100644 --- a/src/@dseries/std.m +++ b/src/@dseries/std.m @@ -1,4 +1,4 @@ -function s = std(o, geometric) % --*-- Unitary tests --*-- +function s = std(o, geometric) % Returns the standard deviation of the variables in a @dseries object o. % See https://en.wikipedia.org/wiki/Geometric_standard_deviation @@ -10,7 +10,7 @@ function s = std(o, geometric) % --*-- Unitary tests --*-- % OUTPUTS % - s [double] 1*N vector. -% Copyright © 2016-2021 Dynare Team +% Copyright © 2016-2023 Dynare Team % % This file is part of Dynare. % @@ -38,7 +38,7 @@ else s = std(o.data); end -return +return % --*-- Unit tests --*-- %@test:1 % Define a dataset. @@ -124,4 +124,4 @@ if t(1) t(3) = dassert(max(abs(s-[.1, .1]))<.0001, true); end T = all(t); -%@eof:4 \ No newline at end of file +%@eof:4 diff --git a/src/@dseries/subsample.m b/src/@dseries/subsample.m index 4f0d5d05a7873e59cd69bddda019808846294bd4..a373ef24285f234c36203e9201660bf5b4eccab2 100644 --- a/src/@dseries/subsample.m +++ b/src/@dseries/subsample.m @@ -1,4 +1,4 @@ -function p = subsample(o, d1, d2) % --*-- Unitary tests --*-- +function p = subsample(o, d1, d2) % function p = subsample(o, d1, d2) @@ -24,7 +24,7 @@ function p = subsample(o, d1, d2) % --*-- Unitary tests --*-- % 3Y | 3 % 4Y | 4 -% Copyright © 2019-2021 Dynare Team +% Copyright © 2019-2023 Dynare Team % % This file is part of Dynare. % @@ -93,7 +93,7 @@ p.dates = o.dates(idx); p.ops = o.ops; p.tags = o.tags; -return +return % --*-- Unit tests --*-- %@test:1 try diff --git a/src/@dseries/subsasgn.m b/src/@dseries/subsasgn.m index 886da1709bdaba081a33316f863fa3e295f40fc5..a4eb9720aa511b161813de5276ff8f65ee30b076 100644 --- a/src/@dseries/subsasgn.m +++ b/src/@dseries/subsasgn.m @@ -1,4 +1,4 @@ -function A = subsasgn(A,S,B) % --*-- Unitary tests --*-- +function A = subsasgn(A,S,B) %@info: %! @deftypefn {Function File} {@var{A} =} subsasgn (@var{A}, @var{S}, @var{B}) @@ -8,7 +8,7 @@ function A = subsasgn(A,S,B) % --*-- Unitary tests --*-- %! @end deftypefn %@eod: -% Copyright © 2012-2021 Dynare Team +% Copyright © 2012-2023 Dynare Team % % This file is part of Dynare. % @@ -234,7 +234,7 @@ if merge_dseries_objects A = merge(A, B, true); end -return +return % --*-- Unit tests --*-- %@test:1 % Define a datasets. @@ -859,4 +859,4 @@ if t(1) end end T = all(t); -%@eof:22 \ No newline at end of file +%@eof:22 diff --git a/src/@dseries/subsref.m b/src/@dseries/subsref.m index b5c101b449f643c113a6bf06b568c1186e26f53f..e2c4c8f6718cbbbab9952e1af366b467858f21d2 100644 --- a/src/@dseries/subsref.m +++ b/src/@dseries/subsref.m @@ -1,4 +1,4 @@ -function r = subsref(o, S) % --*-- Unitary tests --*-- +function r = subsref(o, S) % Overloads the subsref method for dseries class. % @@ -15,7 +15,7 @@ function r = subsref(o, S) % --*-- Unitary tests --*-- % by applying a public method on `o`, or a dseries object built by extracting % a variable from `o`, or a dseries object containing a subsample. -% Copyright © 2011-2022 Dynare Team +% Copyright © 2011-2023 Dynare Team % % This file is part of Dynare. % @@ -319,7 +319,7 @@ if ~isempty(S) r = subsref(r, S); end -return +return % --*-- Unit tests --*-- %@test:1 % Define a data set. diff --git a/src/@dseries/tag.m b/src/@dseries/tag.m index 09bdd75c8eafdbf8ababa82da7c9151c2d062f02..e20f3822d8e850612a55bb1c73b5343a523cf58c 100644 --- a/src/@dseries/tag.m +++ b/src/@dseries/tag.m @@ -1,4 +1,4 @@ -function o = tag(o, a, b, c) % --*-- Unitary tests --*-- +function o = tag(o, a, b, c) % Add tag to a dseries oject (in place modification). @@ -10,8 +10,8 @@ function o = tag(o, a, b, c) % --*-- Unitary tests --*-- % % OUTPUT % - o [dseries] Updated with tag - -% Copyright © 2017-2021 Dynare Team + +% Copyright © 2017-2023 Dynare Team % % This file is part of Dynare. % @@ -47,7 +47,7 @@ else o.tags.(a)(id) = {c}; end -return +return % --*-- Unit tests --*-- %@test:1 ts = dseries(randn(10, 3)); @@ -121,4 +121,4 @@ if t(1) end T = all(t); -%@eof:4 \ No newline at end of file +%@eof:4 diff --git a/src/@dseries/tex_rename.m b/src/@dseries/tex_rename.m index 0c20470b9a0e58b315bec1bba080dfd4f549b1c1..bf0e6707f41d3c03e1ba1108c6d54c683909c7d0 100644 --- a/src/@dseries/tex_rename.m +++ b/src/@dseries/tex_rename.m @@ -1,6 +1,6 @@ -function o = tex_rename(o, varargin) % --*-- Unitary tests --*-- +function o = tex_rename(o, varargin) -% Copyright © 2013-2021 Dynare Team +% Copyright © 2013-2023 Dynare Team % % This file is part of Dynare. % @@ -20,7 +20,7 @@ function o = tex_rename(o, varargin) % --*-- Unitary tests --*-- o = copy(o); o.tex_rename_(varargin{:}); -return +return % --*-- Unit tests --*-- %@test:1 ts = dseries([transpose(1:5), transpose(6:10)],'1950q1',{'Output'; 'Consumption'}, {'Y_t'; 'C_t'}); @@ -43,4 +43,4 @@ if t(1) end T = all(t); -%@eof:1 \ No newline at end of file +%@eof:1 diff --git a/src/@dseries/tex_rename_.m b/src/@dseries/tex_rename_.m index aa147c19278c1282e37990baa033a67a9fc3f762..7157a7d868783bad74c2f2146394b3c75594b05d 100644 --- a/src/@dseries/tex_rename_.m +++ b/src/@dseries/tex_rename_.m @@ -1,4 +1,4 @@ -function o = tex_rename_(o, varargin) % --*-- Unitary tests --*-- +function o = tex_rename_(o, varargin) % Changes TeX name of variables in a dseries object. % @@ -16,7 +16,7 @@ function o = tex_rename_(o, varargin) % --*-- Unitary tests --*-- % first element is the name of the variable and the second argument is the new texname for this % variable. -% Copyright © 2013-2021 Dynare Team +% Copyright © 2013-2023 Dynare Team % % This file is part of Dynare. % @@ -64,7 +64,7 @@ else o.tex(idname) = {newtexname}; end -return +return % --*-- Unit tests --*-- %@test:1 ts = dseries([transpose(1:5), transpose(6:10)],'1950q1',{'Output'; 'Consumption'}, {'Y_t'; 'C_t'}); @@ -102,4 +102,4 @@ if t(1) end T = all(t); -%@eof:3 \ No newline at end of file +%@eof:3 diff --git a/src/@dseries/uminus.m b/src/@dseries/uminus.m index 3b3d10ef379fcce9dfc52777510b7fa33acc1ce4..11c8db083bae83a6b282d470964494974ca7727e 100644 --- a/src/@dseries/uminus.m +++ b/src/@dseries/uminus.m @@ -1,4 +1,4 @@ -function o = uminus(o) % --*-- Unitary tests --*-- +function o = uminus(o) % Overloads the uminus method for dseries objects. % @@ -8,7 +8,7 @@ function o = uminus(o) % --*-- Unitary tests --*-- % OUTPUTS % - o [dseries] -% Copyright © 2012-2021 Dynare Team +% Copyright © 2012-2023 Dynare Team % % This file is part of Dynare. % @@ -37,7 +37,7 @@ for i = 1:vobs(o) end end -return +return % --*-- Unit tests --*-- %@test:1 % Define a datasets. diff --git a/src/@dseries/vertcat.m b/src/@dseries/vertcat.m index 9bcebbc1498325077b48bf962006c6d0e6af82ab..65513668813fba0a7ced53deeaf66b4b13cbd8b6 100644 --- a/src/@dseries/vertcat.m +++ b/src/@dseries/vertcat.m @@ -1,4 +1,4 @@ -function o = vertcat(varargin) % --*-- Unitary tests --*-- +function o = vertcat(varargin) % Overloads vertcat method for dseries objects. % @@ -17,7 +17,7 @@ function o = vertcat(varargin) % --*-- Unitary tests --*-- % % merges the samples. -% Copyright © 2013-2021 Dynare Team +% Copyright © 2013-2023 Dynare Team % % This file is part of Dynare. % @@ -70,7 +70,7 @@ else end d.dates = [b.dates; c.dates]; -return +return % --*-- Unit tests --*-- %@test:1 % Define a data set. diff --git a/src/@dseries/ydiff.m b/src/@dseries/ydiff.m index 3c4fdcb973f29f8c3b01fae6a54b2a08b0acbe22..4c19282f4dcb7e590d8782937f969893c6a8a89c 100644 --- a/src/@dseries/ydiff.m +++ b/src/@dseries/ydiff.m @@ -1,4 +1,4 @@ -function o = ydiff(o) % --*-- Unitary tests --*-- +function o = ydiff(o) % Computes yearly differences. % @@ -8,7 +8,7 @@ function o = ydiff(o) % --*-- Unitary tests --*-- % OUTPUTS % - o [dseries] -% Copyright © 2012-2020 Dynare Team +% Copyright © 2012-2023 Dynare Team % % This file is part of Dynare. % @@ -28,7 +28,7 @@ function o = ydiff(o) % --*-- Unitary tests --*-- o = copy(o); o.ydiff_(); -return +return % --*-- Unit tests --*-- %@test:1 try @@ -50,4 +50,4 @@ if t(1) end T = all(t); -%@eof:1 \ No newline at end of file +%@eof:1 diff --git a/src/@dseries/ydiff_.m b/src/@dseries/ydiff_.m index 582370a9ca3cedbacb69ad2bf2ac93976348a1be..710d3cdde381f72dd1cf617d938fc949e49d182f 100644 --- a/src/@dseries/ydiff_.m +++ b/src/@dseries/ydiff_.m @@ -1,4 +1,4 @@ -function o = ydiff_(o) % --*-- Unitary tests --*-- +function o = ydiff_(o) % Computes yearly differences. % @@ -8,7 +8,7 @@ function o = ydiff_(o) % --*-- Unitary tests --*-- % OUTPUTS % - o [dseries] -% Copyright © 2012-2020 Dynare Team +% Copyright © 2012-2023 Dynare Team % % This file is part of Dynare. % @@ -56,7 +56,7 @@ for i = 1:vobs(o) end end -return +return % --*-- Unit tests --*-- %@test:1 try @@ -159,4 +159,4 @@ if t(1) end T = all(t); -%@eof:6 \ No newline at end of file +%@eof:6 diff --git a/src/@dseries/ygrowth.m b/src/@dseries/ygrowth.m index 718b7e2b661e33e272c7b44e5c8781275dcd29b1..cefb86bd65e818bb02a32b381df9c0be530609f5 100644 --- a/src/@dseries/ygrowth.m +++ b/src/@dseries/ygrowth.m @@ -1,4 +1,4 @@ -function o = ygrowth(o) % --*-- Unitary tests --*-- +function o = ygrowth(o) % Computes yearly growth rates. % @@ -8,7 +8,7 @@ function o = ygrowth(o) % --*-- Unitary tests --*-- % OUTPUTS % - o [dseries] -% Copyright © 2012-2021 Dynare Team +% Copyright © 2012-2023 Dynare Team % % This file is part of Dynare. % @@ -28,7 +28,7 @@ function o = ygrowth(o) % --*-- Unitary tests --*-- o = copy(o); o.ygrowth_(); -return +return % --*-- Unit tests --*-- %@test:1 t = zeros(2,1); @@ -51,4 +51,4 @@ if length(t)>1 end T = all(t); -%@eof:1 \ No newline at end of file +%@eof:1 diff --git a/src/@dseries/ygrowth_.m b/src/@dseries/ygrowth_.m index d3564554ba2ad152ed5fe954b844834962beedcb..1e2e9e9b6766957e4d797ccc24212bf8668efb28 100644 --- a/src/@dseries/ygrowth_.m +++ b/src/@dseries/ygrowth_.m @@ -1,4 +1,4 @@ -function o = ygrowth_(o) % --*-- Unitary tests --*-- +function o = ygrowth_(o) % Computes yearly growth rates. % @@ -8,7 +8,7 @@ function o = ygrowth_(o) % --*-- Unitary tests --*-- % OUTPUTS % - o [dseries] -% Copyright © 2012-2020 Dynare Team +% Copyright © 2012-2023 Dynare Team % % This file is part of Dynare. % @@ -31,7 +31,7 @@ switch frequency(o) o.data(1,:) = NaN; case 2 o.data(3:end,:) = o.data(3:end,:)./o.data(1:end-2,:) - 1; - o.data(1:2,:) = NaN; + o.data(1:2,:) = NaN; case 4 o.data(5:end,:) = o.data(5:end,:)./o.data(1:end-4,:) - 1; o.data(1:4,:) = NaN; @@ -56,7 +56,7 @@ for i = 1:vobs(o) end end -return +return % --*-- Unit tests --*-- %@test:1 try @@ -135,4 +135,4 @@ if t(1) end T = all(t); -%@eof:5 \ No newline at end of file +%@eof:5 diff --git a/src/@x13/clean.m b/src/@x13/clean.m index fe58c04b05d6eb8bd5802214055d6fafaefd5f78..b6deb0b153777481380c416feb77df118c5e4961 100644 --- a/src/@x13/clean.m +++ b/src/@x13/clean.m @@ -1,8 +1,8 @@ -function clean(o) % --*-- Unitary tests --*-- +function clean(o) % Erase generated files if any. -% Copyright © 2017-2021 Dynare Team +% Copyright © 2017-2023 Dynare Team % % This code is free software: you can redistribute it and/or modify % it under the terms of the GNU General Public License as published by @@ -22,7 +22,7 @@ if ~isempty(o.results) delete(sprintf('%s.*', basename)) end -return +return % --*-- Unit tests --*-- %@test:1 try @@ -37,4 +37,4 @@ catch end T = all(t); -%@eof:1 \ No newline at end of file +%@eof:1 diff --git a/src/@x13/print.m b/src/@x13/print.m index a7337529062ff79740ce12c0343d01f7a84c7c88..05216a63ba54622d5869c1c52d04e7764d102082 100644 --- a/src/@x13/print.m +++ b/src/@x13/print.m @@ -1,8 +1,8 @@ -function basename = print(o, basename) % --*-- Unitary tests --*-- +function basename = print(o, basename) % Prints spc file. -% Copyright © 2017 Dynare Team +% Copyright © 2017-2023 Dynare Team % % This file is part of Dynare. % @@ -392,7 +392,7 @@ end fclose(fid); -return +return % --*-- Unit tests --*-- %@test:1 try @@ -423,4 +423,4 @@ catch end T = all(t); -%@eof:1 \ No newline at end of file +%@eof:1 diff --git a/src/@x13/subsasgn.m b/src/@x13/subsasgn.m index 48a4aea7eba3de9a8cdaa8708ea2ecf786a9165f..aa5980bd58a3a67f499c5a1e949fc2de665881d0 100644 --- a/src/@x13/subsasgn.m +++ b/src/@x13/subsasgn.m @@ -1,6 +1,6 @@ -function val = subsasgn(val, idx, rhs) % --*-- Unitary tests --*-- +function val = subsasgn(val, idx, rhs) -% Copyright © 2017-2021 Dynare Team +% Copyright © 2017-2023 Dynare Team % % This code is free software: you can redistribute it and/or modify % it under the terms of the GNU General Public License as published by @@ -17,7 +17,7 @@ function val = subsasgn(val, idx, rhs) % --*-- Unitary tests --*-- error('Members of x13 class are private') -return +return % --*-- Unit tests --*-- %@test:1 t = zeros(3,1); @@ -47,4 +47,4 @@ catch end T = all(t); -%@eof:1 \ No newline at end of file +%@eof:1 diff --git a/src/@x13/subsref.m b/src/@x13/subsref.m index c5373f606531a7415d318fa758fafdf6d3b17f2c..80ae417d105593b7254fcc2a0a4fa14ecc2fbc9a 100644 --- a/src/@x13/subsref.m +++ b/src/@x13/subsref.m @@ -1,8 +1,8 @@ -function o = subsref(o, S) % --*-- Unitary tests --*-- +function o = subsref(o, S) % Overloads the subsref method. -% Copyright © 2017-2021 Dynare Team +% Copyright © 2017-2023 Dynare Team % % This code is free software: you can redistribute it and/or modify % it under the terms of the GNU General Public License as published by @@ -95,7 +95,7 @@ switch S(1).type error('x13:: I do not understand what you are asking for!') end -return +return % --*-- Unit tests --*-- %@test:1 t = zeros(4,1); @@ -133,4 +133,4 @@ catch end T = all(t); -%@eof:1 \ No newline at end of file +%@eof:1 diff --git a/src/@x13/x13.m b/src/@x13/x13.m index 2d1773f88be48b749dcefac27b9f8c4e1788910c..755c53db447b22b46a0fadd3a8bea59023a87eea 100644 --- a/src/@x13/x13.m +++ b/src/@x13/x13.m @@ -1,4 +1,4 @@ -classdef x13<handle % --*-- Unitary tests --*-- +classdef x13<handle % Class for X13 toolbox. @@ -116,9 +116,8 @@ methods o.results = struct(); o.commands = {}; end -end - -end +end % methods +end % classdef --*-- Unit tests --*-- %@test:1 %$ @@ -156,4 +155,4 @@ end %$ end %$ %$ T = all(t); -%@eof:3 \ No newline at end of file +%@eof:3 diff --git a/src/mdbnomics2dseries/mdbnomics2dseries.m b/src/mdbnomics2dseries/mdbnomics2dseries.m index 12712b33f01937edbc76c1792ff623828d1c21b4..ba10e49189762112408eaf54ec9b666347636c6b 100644 --- a/src/mdbnomics2dseries/mdbnomics2dseries.m +++ b/src/mdbnomics2dseries/mdbnomics2dseries.m @@ -1,4 +1,4 @@ -function ds = mdbnomics2dseries(varargin) % --*-- Unitary tests --*-- +function ds = mdbnomics2dseries(varargin) % Given cell array from the mdbnomics library, it returns a dseries object. % @@ -10,7 +10,7 @@ function ds = mdbnomics2dseries(varargin) % --*-- Unitary tests --*-- % OUTPUTS % - ds [dseries] -% Copyright © 2020 Dynare Team +% Copyright © 2020-2023 Dynare Team % % This code is free software: you can redistribute it and/or modify % it under the terms of the GNU General Public License as published by @@ -26,107 +26,108 @@ function ds = mdbnomics2dseries(varargin) % --*-- Unitary tests --*-- % along with Dynare. If not, see <https://www.gnu.org/licenses/>. switch nargin - case 0 - % Return empty object. - error('mdbnomics2dseries:WrongInputArguments', 'Input must be non empty!'); - case 1 - if iscell(varargin{1}) - switch length(varargin{1}) - case 0 - error('mdbnomics2dseries:WrongInputArguments', 'Input must be non empty!'); - otherwise - o.data = varargin{1}(2:end,:); - o.cols = varargin{1}(1,:); - col_idx = {'x_frequency', 'dataset_code', 'series_code', 'original_period', 'period', 'value'}; - for ii = 1:size(col_idx,2) - o.col_idx.(col_idx{ii}) = find(strcmp(col_idx{ii}, o.cols)); - end - % Check if database has multiple frequencies - if size(unique(o.data(:, o.col_idx.x_frequency)),1) > 1 - error('mdbnomics2dseries:DatabaseCheck: The database, that you are trying to convert, contains multiple frequencies. Currently, this type of dseries conversion is not supported. Please select a section of your database with uniform frequency.'); - end - ds = convert_mdbnomics(o); + case 0 + % Return empty object. + error('mdbnomics2dseries:WrongInputArguments', 'Input must be non empty!'); + case 1 + if iscell(varargin{1}) + switch length(varargin{1}) + case 0 + error('mdbnomics2dseries:WrongInputArguments', 'Input must be non empty!'); + otherwise + o.data = varargin{1}(2:end,:); + o.cols = varargin{1}(1,:); + col_idx = {'x_frequency', 'dataset_code', 'series_code', 'original_period', 'period', 'value'}; + for ii = 1:size(col_idx,2) + o.col_idx.(col_idx{ii}) = find(strcmp(col_idx{ii}, o.cols)); end + % Check if database has multiple frequencies + if size(unique(o.data(:, o.col_idx.x_frequency)),1) > 1 + error('mdbnomics2dseries:DatabaseCheck: The database, that you are trying to convert, contains multiple frequencies. Currently, this type of dseries conversion is not supported. Please select a section of your database with uniform frequency.'); + end + ds = convert_mdbnomics(o); end - otherwise - error('mdbnomics2dseries:WrongInputArguments', 'Too many input arguments! Please check the manual.') -end + end + otherwise + error('mdbnomics2dseries:WrongInputArguments', 'Too many input arguments! Please check the manual.') end +return % --*-- Unit tests --*-- + %@test:1 -%$ try -%$ dseries_src_root = strrep(which('initialize_dseries_class'),'initialize_dseries_class.m',''); -%$ df_id = load([dseries_src_root '../tests/data/mdbnomics/df_id.mat']); -%$ df = df_id.df; -%$ ds = mdbnomics2dseries(df); -%$ t(1) = true; -%$ catch -%$ t(1) = false; -%$ end -%$ -%$ if t(1) -%$ t(2) = dassert(ds.name, {'EA19_1_0_0_0_ZUTN'}); -%$ t(3) = dassert(ds.vobs, 1); -%$ t(4) = dassert(ds.tags.provider_code, {'AMECO'}); -%$ t(5:10) = isfield(ds.tags, {'freq', 'unit', 'geo', 'Frequency', 'Unit', 'Country'}); -%$ end -%$ -%$ T = all(t); +try + dseries_src_root = strrep(which('initialize_dseries_class'),'initialize_dseries_class.m',''); + df_id = load([dseries_src_root '../tests/data/mdbnomics/df_id.mat']); + df = df_id.df; + ds = mdbnomics2dseries(df); + t(1) = true; +catch + t(1) = false; +end + +if t(1) + t(2) = dassert(ds.name, {'EA19_1_0_0_0_ZUTN'}); + t(3) = dassert(ds.vobs, 1); + t(4) = dassert(ds.tags.provider_code, {'AMECO'}); + t(5:10) = isfield(ds.tags, {'freq', 'unit', 'geo', 'Frequency', 'Unit', 'Country'}); +end + +T = all(t); %@eof:1 %@test:2 -%$ try -%$ dseries_src_root = strrep(which('initialize_dseries_class'),'initialize_dseries_class.m',''); -%$ df_bi = load([dseries_src_root '../tests/data/mdbnomics/df_bi-annual.mat']); -%$ df = df_bi.df; -%$ ds = mdbnomics2dseries(df); -%$ t(1) = true; -%$ catch -%$ t(1) = false; -%$ end -%$ -%$ if t(1) -%$ t(2) = dassert(ds.name, {'S_EUR_AL'}); -%$ t(3) = dassert(ds.vobs, 1); -%$ t(4) = dassert(ds.dates.freq, 2); -%$ t(4) = dassert(ds.tags.provider_code, {'Eurostat'}); -%$ t(5:10) = isfield(ds.tags, {'FREQ', 'currency', 'geo', 'Frequency', 'Currency', 'Geopolitical_entity__reporting_'}); -%$ end -%$ -%$ T = all(t); +try + dseries_src_root = strrep(which('initialize_dseries_class'),'initialize_dseries_class.m',''); + df_bi = load([dseries_src_root '../tests/data/mdbnomics/df_bi-annual.mat']); + df = df_bi.df; + ds = mdbnomics2dseries(df); + t(1) = true; +catch + t(1) = false; +end + +if t(1) + t(2) = dassert(ds.name, {'S_EUR_AL'}); + t(3) = dassert(ds.vobs, 1); + t(4) = dassert(ds.dates.freq, 2); + t(4) = dassert(ds.tags.provider_code, {'Eurostat'}); + t(5:10) = isfield(ds.tags, {'FREQ', 'currency', 'geo', 'Frequency', 'Currency', 'Geopolitical_entity__reporting_'}); +end + +T = all(t); %@eof:2 %@test:3 -%$ try -%$ dseries_src_root = strrep(which('initialize_dseries_class'),'initialize_dseries_class.m',''); -%$ df_dataset = load([dseries_src_root '../tests/data/mdbnomics/df_dataset.mat']); -%$ df = df_dataset.df; -%$ ds = mdbnomics2dseries(df); -%$ t(1) = true; -%$ catch -%$ t(1) = false; -%$ end -%$ -%$ if t(1) -%$ t(2) = dassert(ds.vobs, 49); -%$ t(3) = dassert(ds.dates.freq, 1); -%$ t(4) = dassert(length(unique(ds.tags.provider_code)), 1); -%$ t(5) = dassert(size(ds.tags.provider_code,1), 49); -%$ end -%$ -%$ T = all(t); +try + dseries_src_root = strrep(which('initialize_dseries_class'),'initialize_dseries_class.m',''); + df_dataset = load([dseries_src_root '../tests/data/mdbnomics/df_dataset.mat']); + df = df_dataset.df; + ds = mdbnomics2dseries(df); + t(1) = true; +catch + t(1) = false; +end + +if t(1) + t(2) = dassert(ds.vobs, 49); + t(3) = dassert(ds.dates.freq, 1); + t(4) = dassert(length(unique(ds.tags.provider_code)), 1); + t(5) = dassert(size(ds.tags.provider_code,1), 49); +end + +T = all(t); %@eof:3 %@test:4 -%$ try -%$ dseries_src_root = strrep(which('initialize_dseries_class'),'initialize_dseries_class.m',''); -%$ df_multi = load([dseries_src_root '../tests/data/mdbnomics/df_multi-freq.mat']); -%$ df = df_multi.df; -%$ ds = mdbnomics2dseries(df); -%$ t(1) = false; -%$ catch -%$ t(1) = true; -%$ end -%$ -%$ T = all(t); +try + dseries_src_root = strrep(which('initialize_dseries_class'),'initialize_dseries_class.m',''); + df_multi = load([dseries_src_root '../tests/data/mdbnomics/df_multi-freq.mat']); + df = df_multi.df; + ds = mdbnomics2dseries(df); + t(1) = false; +catch + t(1) = true; +end + +T = all(t); %@eof:4 diff --git a/src/read/load_csv_file_data.m b/src/read/load_csv_file_data.m index 042910531c7d38215e5866e183949432daa9f46a..bfddf0c14d38ed15be239e6d2f1b15dc32d2b07e 100644 --- a/src/read/load_csv_file_data.m +++ b/src/read/load_csv_file_data.m @@ -1,4 +1,4 @@ -function [freq, init, data, varlist] = load_csv_file_data(file) % --*-- Unitary tests --*-- +function [freq, init, data, varlist] = load_csv_file_data(file) %function [freq, init, data, varlist] = load_csv_file_data(file) % Loads data in a csv file. % @@ -16,7 +16,7 @@ function [freq, init, data, varlist] = load_csv_file_data(file) % --*-- Unitary % names. Similarly, if the first column does not contain dates, then % freq will be 1 and init will be year 1. -% Copyright © 2012-2021 Dynare Team +% Copyright © 2012-2023 Dynare Team % % This file is part of Dynare. % @@ -193,7 +193,7 @@ varlist = transpose(varlist); % Remove double quotes if any varlist = strrep(varlist,'"',''); -return +return % --*-- Unit tests --*-- %@test:1 % Download csv file with data. diff --git a/src/read/load_m_file_data.m b/src/read/load_m_file_data.m index ae6efc768af80b0c2e835229811b21cb08e40477..4c6017a239080c6ba09903a15e1320f1c0d0365c 100644 --- a/src/read/load_m_file_data.m +++ b/src/read/load_m_file_data.m @@ -1,4 +1,4 @@ -function [freq, init, data, varlist, tex, ops, tags] = load_m_file_data(file) % --*-- Unitary tests --*-- +function [freq, init, data, varlist, tex, ops, tags] = load_m_file_data(file) % Loads data in a matlab/octave script. % @@ -16,7 +16,7 @@ function [freq, init, data, varlist, tex, ops, tags] = load_m_file_data(file) % % be a scalar integer and INIT__ a string like '1938M11', '1945Q3', '1973W3' or '2009A'. If these variables are not specified % default values for freq and init are 1 and dates(1,1). -% Copyright © 2012-2021 Dynare Team +% Copyright © 2012-2023 Dynare Team % % This file is part of Dynare. % @@ -55,7 +55,7 @@ end [freq, init, data, varlist, tex, ops, tags] = load_mat_file_data(tmp__dataSet__struct); -return +return % --*-- Unit tests --*-- %@test:1 % Create a data m-file diff --git a/src/read/load_mat_file_data.m b/src/read/load_mat_file_data.m index 74753d59fba1960fbc39c551f0c487d0cc3cd934..d4bb71407cc192fd702b2aed52d5e637305192ec 100644 --- a/src/read/load_mat_file_data.m +++ b/src/read/load_mat_file_data.m @@ -1,4 +1,4 @@ -function [freq, init, data, varlist, tex, ops, tags] = load_mat_file_data(file) % --*-- Unitary tests --*-- +function [freq, init, data, varlist, tex, ops, tags] = load_mat_file_data(file) % Loads data in a matlab/octave mat-file. % @@ -17,7 +17,7 @@ function [freq, init, data, varlist, tex, ops, tags] = load_mat_file_data(file) % be a scalar integer and INIT__ a string like '1938M11', '1945Q3', '1973W3' or '2009A'. If these variables are not specified % default values for freq and init are 1 and dates(1,1). -% Copyright © 2012-2021 Dynare Team +% Copyright © 2012-2023 Dynare Team % % This file is part of Dynare. % @@ -120,7 +120,7 @@ if isempty(ops) ops = cell(length(varlist), 1); end -return +return % --*-- Unit tests --*-- %@test:1 % Create a data mat-file @@ -199,4 +199,4 @@ t(8) = dassert(ops,{'grandad(hagop)';'dad(bedros)'}); t(9) = dassert(data(:,1),[1;2;3;4;5]); t(10) = dassert(data(:,2),[2;3;4;5;6]); T = all(t); -%@eof:2 \ No newline at end of file +%@eof:2 diff --git a/src/utilities/convert/date2string.m b/src/utilities/convert/date2string.m index 47a40e25709c40355d1ed5f7f6bb424ef100d9cb..851c96680c87f18f2bf454a4e4197c8e6f7a1d8c 100644 --- a/src/utilities/convert/date2string.m +++ b/src/utilities/convert/date2string.m @@ -1,4 +1,4 @@ -function s = date2string(varargin) % --*-- Unitary tests --*-- +function s = date2string(varargin) % Returns date as a string. % @@ -10,7 +10,7 @@ function s = date2string(varargin) % --*-- Unitary tests --*-- % OUTPUTS % - s [char] 1×n array. -% Copyright © 2013-2021 Dynare Team +% Copyright © 2013-2023 Dynare Team % % This file is part of Dynare. % @@ -75,7 +75,7 @@ else s = sprintf('%i%s%i', year, freq2string(freq), subperiod); end -return +return % --*-- Unit tests --*-- %@test:1 try @@ -161,4 +161,4 @@ if t(1) end T = all(t); -%@eof:6 \ No newline at end of file +%@eof:6 diff --git a/src/utilities/convert/dates2M.m b/src/utilities/convert/dates2M.m index 4591f0949bbea0eaab9fd87f577bddc5d387c50e..c8d2602ddac0b6223bfce8973245539f349b3d60 100644 --- a/src/utilities/convert/dates2M.m +++ b/src/utilities/convert/dates2M.m @@ -1,4 +1,4 @@ -function m = dates2M(d) % --*-- Unitary tests --*-- +function m = dates2M(d) % INPUTS % - d [dates] daily frequency object with n elements. @@ -6,7 +6,7 @@ function m = dates2M(d) % --*-- Unitary tests --*-- % OUTPUTS % - m [dates] monthly frequency object with n elements (with repetitions). -% Copyright © 2021 Dynare Team +% Copyright © 2021-2023 Dynare Team % % This code is free software: you can redistribute it and/or modify % it under the terms of the GNU General Public License as published by @@ -32,7 +32,7 @@ end m = dates(12, time(:,1:2)); -return +return % --*-- Unit tests --*-- %@test:1 try @@ -73,4 +73,4 @@ catch end T = all(t); -%@eof:3 \ No newline at end of file +%@eof:3 diff --git a/src/utilities/convert/dates2Q.m b/src/utilities/convert/dates2Q.m index c29daeee9702512264c8652b2610db65ad5f113b..1ba673c9ad9a531cd0f752f13384a0434bea2449 100644 --- a/src/utilities/convert/dates2Q.m +++ b/src/utilities/convert/dates2Q.m @@ -1,4 +1,4 @@ -function m = dates2Q(d) % --*-- Unitary tests --*-- +function m = dates2Q(d) % INPUTS % - d [dates] daily, monthly or quarterly frequency object with n elements. @@ -6,7 +6,7 @@ function m = dates2Q(d) % --*-- Unitary tests --*-- % OUTPUTS % - q [dates] quaterly frequency object with n elements (with repetitions). -% Copyright © 2020 Dynare Team +% Copyright © 2020-2023 Dynare Team % % This code is free software: you can redistribute it and/or modify % it under the terms of the GNU General Public License as published by @@ -46,7 +46,7 @@ time(isq4,2) = 4; m = dates(4, time(:,1:2)); -return +return % --*-- Unit tests --*-- %@test:1 try @@ -102,4 +102,4 @@ catch end T = all(t); -%@eof:4 \ No newline at end of file +%@eof:4 diff --git a/src/utilities/convert/dates2S.m b/src/utilities/convert/dates2S.m index 2ff307d9594f2f2d6a0ee7f1f828539c0d291fb3..145375914546c5cd3a252a0f4397f5149672d053 100644 --- a/src/utilities/convert/dates2S.m +++ b/src/utilities/convert/dates2S.m @@ -1,4 +1,4 @@ -function m = dates2S(d) % --*-- Unitary tests --*-- +function m = dates2S(d) % INPUTS % - d [dates] daily, monthly, quarterly or bi-annual frequency object with n elements. @@ -6,7 +6,7 @@ function m = dates2S(d) % --*-- Unitary tests --*-- % OUTPUTS % - q [dates] bi-annual frequency object with n elements (with repetitions). -% Copyright © 2021 Dynare Team +% Copyright © 2021-2023 Dynare Team % % This code is free software: you can redistribute it and/or modify % it under the terms of the GNU General Public License as published by @@ -47,7 +47,7 @@ time(ish2,2) = 2; m = dates(2, time(:,1:2)); -return +return % --*-- Unit tests --*-- %@test:1 try @@ -107,4 +107,4 @@ if t(1) end T = all(t); -%@eof:4 \ No newline at end of file +%@eof:4 diff --git a/src/utilities/convert/dates2Y.m b/src/utilities/convert/dates2Y.m index 03314ccb52b76ea977afa4c432ccec9722c63852..60574560735d51c5e403f1195866d6e54a7b1eab 100644 --- a/src/utilities/convert/dates2Y.m +++ b/src/utilities/convert/dates2Y.m @@ -1,4 +1,4 @@ -function y = dates2Y(d) % --*-- Unitary tests --*-- +function y = dates2Y(d) % INPUTS % - d [dates] daily, monthly, qarterly or bi-annual frequency object with n elements. @@ -6,7 +6,7 @@ function y = dates2Y(d) % --*-- Unitary tests --*-- % OUTPUTS % - y [dates] annual frequency object with n elements (with repetitions). -% Copyright © 2020 Dynare Team +% Copyright © 2020-2023 Dynare Team % % This code is free software: you can redistribute it and/or modify % it under the terms of the GNU General Public License as published by @@ -34,7 +34,7 @@ end y = dates(1, time(:,1)); -return +return % --*-- Unit tests --*-- %@test:1 try @@ -94,4 +94,4 @@ if t(1) end T = all(t); -%@eof:4 \ No newline at end of file +%@eof:4 diff --git a/src/utilities/convert/dseries2M.m b/src/utilities/convert/dseries2M.m index dfae0a4831c8749c6523d496d88934357b1f1ece..27bb1dbbc761f7a63ff50750aecaddc0aecac8d5 100644 --- a/src/utilities/convert/dseries2M.m +++ b/src/utilities/convert/dseries2M.m @@ -1,4 +1,4 @@ -function ts = dseries2M(ds, method) % --*-- Unitary tests --*-- +function ts = dseries2M(ds, method) % INPUTS % - ds [dseries] daily frequency object with n elements. @@ -11,7 +11,7 @@ function ts = dseries2M(ds, method) % --*-- Unitary tests --*-- % OUTPUTS % - ts [dseries] monthly frequency object with m<n elements. -% Copyright © 2020-2021 Dynare Team +% Copyright © 2020-2023 Dynare Team % % This code is free software: you can redistribute it and/or modify % it under the terms of the GNU General Public License as published by @@ -80,7 +80,7 @@ end ts = dseries(tdata, dM, ds.name, ds.tex); -return +return % --*-- Unit tests --*-- %@test:1 try diff --git a/src/utilities/convert/dseries2Q.m b/src/utilities/convert/dseries2Q.m index 5754ca395712a496c13ba68012a3b95902680f13..d34aec312b93204de2cd5672924cbc35c439e97a 100644 --- a/src/utilities/convert/dseries2Q.m +++ b/src/utilities/convert/dseries2Q.m @@ -1,4 +1,4 @@ -function ts = dseries2Q(ds, method) % --*-- Unitary tests --*-- +function ts = dseries2Q(ds, method) % INPUTS % - ds [dseries] daily or monthly frequency object with n elements. @@ -11,7 +11,7 @@ function ts = dseries2Q(ds, method) % --*-- Unitary tests --*-- % OUTPUTS % - ts [dseries] quaterly frequency object with m<n elements. -% Copyright © 2020-2021 Dynare Team +% Copyright © 2020-2023 Dynare Team % % This code is free software: you can redistribute it and/or modify % it under the terms of the GNU General Public License as published by @@ -97,7 +97,7 @@ end ts = dseries(tdata, dQ, ds.name, ds.tex); -return +return % --*-- Unit tests --*-- %@test:1 try @@ -233,4 +233,4 @@ if t(1) end T = all(t); -%@eof:8 \ No newline at end of file +%@eof:8 diff --git a/src/utilities/convert/dseries2S.m b/src/utilities/convert/dseries2S.m index 9513f75004a4500541675bec683506379faa33e5..7b5416606bfc913b344a4c23d8aac144bd220f96 100644 --- a/src/utilities/convert/dseries2S.m +++ b/src/utilities/convert/dseries2S.m @@ -1,4 +1,4 @@ -function ts = dseries2S(ds, method) % --*-- Unitary tests --*-- +function ts = dseries2S(ds, method) % INPUTS % - ds [dseries] daily, monthly or quarterly frequency object with n elements. @@ -11,7 +11,7 @@ function ts = dseries2S(ds, method) % --*-- Unitary tests --*-- % OUTPUTS % - ts [dseries] bi-annual frequency object with m<n elements. -% Copyright © 2021 Dynare Team +% Copyright © 2021-2023 Dynare Team % % This code is free software: you can redistribute it and/or modify % it under the terms of the GNU General Public License as published by @@ -112,7 +112,7 @@ end ts = dseries(tdata, dH, ds.name, ds.tex); -return +return % --*-- Unit tests --*-- %@test:1 try @@ -316,4 +316,4 @@ if t(1) end T = all(t); -%@eof:12 \ No newline at end of file +%@eof:12 diff --git a/src/utilities/convert/dseries2Y.m b/src/utilities/convert/dseries2Y.m index 059f8ffeadc7497a6030f8920d95979356cd7b19..7ee6b4f486702141ad5a88b92c4264faa3212b5c 100644 --- a/src/utilities/convert/dseries2Y.m +++ b/src/utilities/convert/dseries2Y.m @@ -1,4 +1,4 @@ -function ts = dseries2Y(ds, method) % --*-- Unitary tests --*-- +function ts = dseries2Y(ds, method) % INPUTS % - ds [dseries] daily, monthly, quarterly, bi-annual or yearly frequency object with n elements. @@ -11,7 +11,7 @@ function ts = dseries2Y(ds, method) % --*-- Unitary tests --*-- % OUTPUTS % - ts [dseries] annual frequency object with m<n elements. -% Copyright © 2021 Dynare Team +% Copyright © 2021-2023 Dynare Team % % This code is free software: you can redistribute it and/or modify % it under the terms of the GNU General Public License as published by @@ -123,7 +123,7 @@ end ts = dseries(tdata, dY, ds.name, ds.tex); -return +return % --*-- Unit tests --*-- %@test:1 try @@ -327,4 +327,4 @@ if t(1) end T = all(t); -%@eof:12 \ No newline at end of file +%@eof:12 diff --git a/src/utilities/convert/freq2string.m b/src/utilities/convert/freq2string.m index 249abded5e2c253c6541aca237612ab22989e76d..505fb475d3b1917e6be18368775899f36b0453f1 100644 --- a/src/utilities/convert/freq2string.m +++ b/src/utilities/convert/freq2string.m @@ -1,4 +1,4 @@ -function s = freq2string(freq) % --*-- Unitary tests --*-- +function s = freq2string(freq) % INPUTS % - freq [integer] scalar equal to 1, 2, 4, 12, 52, or 365 (resp. annual, bi-annual, quaterly, monthly, weekly, or daily) @@ -6,7 +6,7 @@ function s = freq2string(freq) % --*-- Unitary tests --*-- % OUTPUTS % - s [char] scalar equal to Y, S, Q, M, W, or D (resp. annual, bi-annual, quaterly, monthly, weekly, or daily) -% Copyright © 2013-2021 Dynare Team +% Copyright © 2013-2023 Dynare Team % % This file is part of Dynare. % @@ -40,7 +40,7 @@ switch freq error('dates::freq2string: Unknown frequency!') end -return +return % --*-- Unit tests --*-- %@test:1 try diff --git a/src/utilities/convert/string2date.m b/src/utilities/convert/string2date.m index c3ce5deb03af63bbf490f03d5d9dbded4e6cbd5a..a39aff90b8d5eb4683687bb260974caee74610ce 100644 --- a/src/utilities/convert/string2date.m +++ b/src/utilities/convert/string2date.m @@ -1,6 +1,6 @@ -function date = string2date(a) % --*-- Unitary tests --*-- +function date = string2date(a) -% Copyright © 2013-2021 Dynare Team +% Copyright © 2013-2023 Dynare Team % % This file is part of Dynare. % @@ -64,7 +64,7 @@ if isdaily(a) return end -return +return % --*-- Unit tests --*-- %@test:1 % Define some dates @@ -123,4 +123,4 @@ t(14)= isequal(d8.freq,e_freq_8); t(15)= isequal(d9.freq,e_freq_9); t(16)= isequal(d9.time(1),e_date_9(1)); T = all(t); -%@eof:1 \ No newline at end of file +%@eof:1 diff --git a/src/utilities/convert/string2freq.m b/src/utilities/convert/string2freq.m index 1df5f96f4351eef163d7545cfb6e38ddf4787fff..66d778069a615058973e65a97e1a9387e3701272 100644 --- a/src/utilities/convert/string2freq.m +++ b/src/utilities/convert/string2freq.m @@ -1,4 +1,4 @@ -function freq = string2freq(s) % --*-- Unitary tests --*-- +function freq = string2freq(s) % INPUTS % - s [char] scalar equal to Y, H, Q, M, or D (resp. annual, bi-annual, quaterly, monthly, or daily) @@ -6,7 +6,7 @@ function freq = string2freq(s) % --*-- Unitary tests --*-- % OUTPUTS % - freq [integer] scalar equal to 1, 2, 4, 12, or 365 (resp. annual, bi-annual, quaterly, monthly, or daily) -% Copyright © 2013-2020 Dynare Team +% Copyright © 2013-2023 Dynare Team % % This file is part of Dynare. % @@ -38,7 +38,7 @@ switch upper(s) error('dates::freq2string: Unknown frequency!') end -return +return % --*-- Unit tests --*-- %@test:1 try diff --git a/src/utilities/from/from.m b/src/utilities/from/from.m index 6a6a7619c97569ac2c16248a69bcea1260357d05..03e00dcb848fa990d68765148f50852270d92a49 100644 --- a/src/utilities/from/from.m +++ b/src/utilities/from/from.m @@ -1,6 +1,6 @@ -function from(varargin) % --*-- Unitary tests --*-- +function from(varargin) -% Copyright © 2014-2018 Dynare Team +% Copyright © 2014-2023 Dynare Team % % This file is part of Dynare. % @@ -423,7 +423,7 @@ if ~isempty(idv) end i = 0; -return +return % --*-- Unit tests --*-- %@test:1 try diff --git a/src/utilities/get/get_series_start_date.m b/src/utilities/get/get_series_start_date.m index 31bfd677c8e5ad7e4fb22041daff14e7fdcf80e1..d05d832b4c4f51736116a228b9ee626b2bf2bf2b 100644 --- a/src/utilities/get/get_series_start_date.m +++ b/src/utilities/get/get_series_start_date.m @@ -1,4 +1,4 @@ -function series_start_date = get_series_start_date(frequency, original_period) % --*-- Unitary tests --*-- +function series_start_date = get_series_start_date(frequency, original_period) % Given cell array obtained using from the mdbnomics library, % it returns a cell array of metadata ot be appended to a dseries object. % @@ -9,7 +9,7 @@ function series_start_date = get_series_start_date(frequency, original_period) % OUTPUTS % - series_start_date [string] -% Copyright © 2020-2021 Dynare Team +% Copyright © 2020-2023 Dynare Team % % This code is free software: you can redistribute it and/or modify % it under the terms of the GNU General Public License as published by @@ -40,7 +40,7 @@ switch frequency error('mdbnomics2dseries::get_series_start_date: The frequency of the dataset is currently unsupported!'); end -return +return % --*-- Unit tests --*-- %@test:1 try @@ -115,4 +115,4 @@ if t(1) end T = all(t); -%@eof:5 \ No newline at end of file +%@eof:5 diff --git a/src/utilities/insert/insert_column_vector_in_a_matrix.m b/src/utilities/insert/insert_column_vector_in_a_matrix.m index 068241c187c8e6f7d5dddb2a242a0b1188158435..bbb4903dd6b1b06814390cd43663da5644a13fa6 100644 --- a/src/utilities/insert/insert_column_vector_in_a_matrix.m +++ b/src/utilities/insert/insert_column_vector_in_a_matrix.m @@ -1,4 +1,4 @@ -function matrix = insert_column_vector_in_a_matrix(matrix, vector, i) % --*-- Unitary tests --*-- +function matrix = insert_column_vector_in_a_matrix(matrix, vector, i) % Inserts a vector in a matrix in a column specified by i. % @@ -10,7 +10,7 @@ function matrix = insert_column_vector_in_a_matrix(matrix, vector, i) % --*-- U % OUTPUTS % - matrix [float] n*(m+1) matrix. -% Copyright © 2013-2021 Dynare Team +% Copyright © 2013-2023 Dynare Team % % This code is free software: you can redistribute it and/or modify % it under the terms of the GNU General Public License as published by @@ -52,7 +52,7 @@ switch i matrix = [matrix(:,1:i-1), vector, matrix(:,i:m)]; end -return +return % --*-- Unit tests --*-- %@test:1 % Define a datasets. @@ -73,4 +73,4 @@ if t(1) t(4) = dassert(A2,[A(:,1), b, A(:,2:end)],1e-15); end T = all(t); -%@eof:1 \ No newline at end of file +%@eof:1 diff --git a/src/utilities/insert/insert_object_in_a_one_dimensional_cell_array.m b/src/utilities/insert/insert_object_in_a_one_dimensional_cell_array.m index 5ec08f489429536c6cfeb47ee7c31aadc4aa6bd3..f82dcf4058dc50e59ab63d144699b25878c06125 100644 --- a/src/utilities/insert/insert_object_in_a_one_dimensional_cell_array.m +++ b/src/utilities/insert/insert_object_in_a_one_dimensional_cell_array.m @@ -1,4 +1,4 @@ -function one_dimensional_cell_array = insert_object_in_a_one_dimensional_cell_array(one_dimensional_cell_array, object, i) % --*-- Unitary tests --*-- +function one_dimensional_cell_array = insert_object_in_a_one_dimensional_cell_array(one_dimensional_cell_array, object, i) % Inserts an object in a one dimensional cell array in a position specified by i. % @@ -10,7 +10,7 @@ function one_dimensional_cell_array = insert_object_in_a_one_dimensional_cell_ar % OUTPUTS % - one_dimensional_cell_array [any] cell array with n+1 elements. -% Copyright © 2013-2021 Dynare Team +% Copyright © 2013-2023 Dynare Team % % This code is free software: you can redistribute it and/or modify % it under the terms of the GNU General Public License as published by @@ -60,7 +60,7 @@ if nc>nr one_dimensional_cell_array = transpose(one_dimensional_cell_array); end -return +return % --*-- Unit tests --*-- %@test:1 A = {'A1'; 'A2'; 'A3'}; b = [1, pi]; @@ -80,4 +80,4 @@ if t(1) t(4) = dassert(C2,[A(1); b; A(2:3)]); end T = all(t); -%@eof:1 \ No newline at end of file +%@eof:1 diff --git a/src/utilities/is/isbiannual.m b/src/utilities/is/isbiannual.m index ec206f90e8c0aaa3e084233c4a5d5b8281ac9ce3..3fa2b5d54b54762684d60b16ef4a31179d2b655b 100644 --- a/src/utilities/is/isbiannual.m +++ b/src/utilities/is/isbiannual.m @@ -1,4 +1,4 @@ -function b = isbiannual(str) % --*-- Unitary tests --*-- +function b = isbiannual(str) % Tests if the input can be interpreted as a bi-annual date (semester). % @@ -8,7 +8,7 @@ function b = isbiannual(str) % --*-- Unitary tests --*-- % OUTPUTS % o b integer scalar, equal to 1 if str can be interpreted as a bi-annual date or 0 otherwise. -% Copyright © 2021 Dynare Team +% Copyright © 2021-2023 Dynare Team % % This file is part of Dynare. % @@ -35,7 +35,7 @@ else b = false; end -return +return % --*-- Unit tests --*-- %@test:1 date_1 = '1950H2'; @@ -58,4 +58,4 @@ t(7) = dassert(isbiannual(date_7),false); t(8) = dassert(isbiannual(date_8),true); t(9) = dassert(isbiannual(date_9),true); T = all(t); -%@eof:1 \ No newline at end of file +%@eof:1 diff --git a/src/utilities/is/isdaily.m b/src/utilities/is/isdaily.m index 9670dcd8fc591f7f89d596cb29ed43c6ae0d113a..894be69f49fad386260d3051754948244a021882 100644 --- a/src/utilities/is/isdaily.m +++ b/src/utilities/is/isdaily.m @@ -1,4 +1,4 @@ -function b = isdaily(str) % --*-- Unitary tests --*-- +function b = isdaily(str) % Tests if the input can be interpreted as a daily date. % @@ -8,7 +8,7 @@ function b = isdaily(str) % --*-- Unitary tests --*-- % OUTPUTS % - b [logical] scalar, equal to true iff str can be interpreted as a daily date. -% Copyright © 2020 Dynare Team +% Copyright © 2020-2023 Dynare Team % % This file is part of Dynare. % @@ -41,7 +41,7 @@ else b = false; end -return +return % --*-- Unit tests --*-- %@test:1 t(1) = isdaily('1950-03-29'); @@ -56,4 +56,4 @@ t(9) = ~isdaily('2000-12-00'); t(10) = ~isdaily('1999-02-29'); t(11) = isdaily('2000-02-29'); T = all(t); -%@eof:1 \ No newline at end of file +%@eof:1 diff --git a/src/utilities/is/isdate.m b/src/utilities/is/isdate.m index 41ba5e9e3412c37d1350b71a851b502809be21f0..78e967ece1f38a6f0bbfc322724098e02caf402a 100644 --- a/src/utilities/is/isdate.m +++ b/src/utilities/is/isdate.m @@ -1,4 +1,4 @@ -function b = isdate(str) % --*-- Unitary tests --*-- +function b = isdate(str) % Tests if the input string can be interpreted as a date. % @@ -8,7 +8,7 @@ function b = isdate(str) % --*-- Unitary tests --*-- % OUTPUTS % - b [logical] scalar equal to true iff str can be interpreted as a date. -% Copyright © 2013-2021 Dynare Team +% Copyright © 2013-2023 Dynare Team % % This file is part of Dynare. % @@ -32,7 +32,7 @@ end b = isstringdate(str); -return +return % --*-- Unit tests --*-- %@test:1 date_1 = 1950; @@ -59,4 +59,4 @@ t(9) = isdate(date_9); t(10) = isdate(date_10); t(11) = ~isdate(date_11); T = all(t); -%@eof:1 \ No newline at end of file +%@eof:1 diff --git a/src/utilities/is/isdates.m b/src/utilities/is/isdates.m index e781dddae4579a383e502436fcd7fb8f7315a577..27887ca00d1bc71f21f07adf8fb156a65046ac7b 100644 --- a/src/utilities/is/isdates.m +++ b/src/utilities/is/isdates.m @@ -1,8 +1,8 @@ -function B = isdates(A) % --*-- Unitary tests --*-- +function B = isdates(A) % Tests if the input A is a dates object. -% Copyright © 2013-2021 Dynare Team +% Copyright © 2013-2023 Dynare Team % % This file is part of Dynare. % @@ -21,7 +21,7 @@ function B = isdates(A) % --*-- Unitary tests --*-- B = isa(A,'dates'); -return +return % --*-- Unit tests --*-- %@test:1 try @@ -111,4 +111,4 @@ if t(1) end T = all(t); -%@eof:6 \ No newline at end of file +%@eof:6 diff --git a/src/utilities/is/isfreq.m b/src/utilities/is/isfreq.m index af117ad859c327853aa151940c772bd961082fe4..9cfe50cb4351932b0812980a5a2ec0dc6e181451 100644 --- a/src/utilities/is/isfreq.m +++ b/src/utilities/is/isfreq.m @@ -1,4 +1,4 @@ -function B = isfreq(A) % --*-- Unitary tests --*-- +function B = isfreq(A) % Tests if A can be interpreted as a frequency. % @@ -8,7 +8,7 @@ function B = isfreq(A) % --*-- Unitary tests --*-- % OUTPUTS % - B [logical] scalar equal to true iff A can be interpreted as a frequency. -% Copyright © 2013-2021 Dynare Team +% Copyright © 2013-2023 Dynare Team % % This file is part of Dynare. % @@ -38,7 +38,7 @@ if isnumeric(A) && isequal(length(A),1) && ismember(A,[1 2 4 12 52 365]) B = true; end -return +return % --*-- Unit tests --*-- %@test:1 try @@ -128,4 +128,4 @@ if t(1) end T = all(t); -%@eof:6 \ No newline at end of file +%@eof:6 diff --git a/src/utilities/is/isleapyear.m b/src/utilities/is/isleapyear.m index ae3a984ad5194faac7fc536438cca39a6cdbfc82..98ea804a754fe08824fc9165e979b676f813fdca 100644 --- a/src/utilities/is/isleapyear.m +++ b/src/utilities/is/isleapyear.m @@ -1,4 +1,4 @@ -function b = isleapyear(y) % --*-- Unitary tests --*-- +function b = isleapyear(y) % Returns true iff y is a leap year. % @@ -9,7 +9,7 @@ function b = isleapyear(y) % --*-- Unitary tests --*-- % - b [logical] scalar or vector, equal to true iff y is a leap year. -% Copyright © 2015-2021 Dynare Team +% Copyright © 2015-2023 Dynare Team % % This file is part of Dynare. % @@ -37,7 +37,7 @@ else error('Input must be an integer scalar or vector of integers.') end -return +return % --*-- Unit tests --*-- %@test:1 LeapYears = [1904; 1908; 1912; 1916; 1920; 1924; 1928; 1932; 1936; @@ -130,4 +130,4 @@ if t(1) end T = all(t); -%@eof:2 \ No newline at end of file +%@eof:2 diff --git a/src/utilities/is/islongyear.m b/src/utilities/is/islongyear.m index 22de544ea41a1fe3f37b46633548ac42e677ccde..2d2c2c70e7e31a25b720aaf433a50e0f837bb8ab 100644 --- a/src/utilities/is/islongyear.m +++ b/src/utilities/is/islongyear.m @@ -1,4 +1,4 @@ -function b = islongyear(y) % --*-- Unitary tests --*-- +function b = islongyear(y) % Returns true iff y is a year with 53 weeks. % @@ -9,7 +9,7 @@ function b = islongyear(y) % --*-- Unitary tests --*-- % - b [logical] scalar or vector, equal to true iff y is a leap year. -% Copyright © 2021 Dynare Team +% Copyright © 2023 Dynare Team % % This file is part of Dynare. % @@ -28,7 +28,7 @@ function b = islongyear(y) % --*-- Unitary tests --*-- b = mod(y+fix(y/4)-fix(y/100)+fix(y/400),7)==4 | mod(y-1+fix((y-1)/4)-fix((y-1)/100)+fix((y-1)/400),7)==3; -return +return % --*-- Unit tests --*-- %@test:1 Years = [4; 9 ; 15 ; 20 ; 26 ; 32 ; 37 ; 43 ; 48 ; 54 ; 60 ; 65 ; 71 ; 76 ; 82 ; 88 ; 93 ; 99 ; @@ -69,4 +69,4 @@ if t(1) end T = all(t); -%@eof:2 \ No newline at end of file +%@eof:2 diff --git a/src/utilities/is/ismonthly.m b/src/utilities/is/ismonthly.m index 9e3c1f5299dd25e4b5682fe6855a7c4835e931fb..fd1ade7e28060a9ef2423be1e17c0c5f24fe7697 100644 --- a/src/utilities/is/ismonthly.m +++ b/src/utilities/is/ismonthly.m @@ -1,4 +1,4 @@ -function b = ismonthly(str) % --*-- Unitary tests --*-- +function b = ismonthly(str) % Tests if the input can be interpreted as a monthly date. % @@ -8,7 +8,7 @@ function b = ismonthly(str) % --*-- Unitary tests --*-- % OUTPUTS % o b integer scalar, equal to 1 if str can be interpreted as a monthly date or 0 otherwise. -% Copyright © 2012-2021 Dynare Team +% Copyright © 2012-2023 Dynare Team % % This file is part of Dynare. % @@ -35,7 +35,7 @@ else b = false; end -return +return % --*-- Unit tests --*-- %@test:1 date_1 = '1950M2'; @@ -56,4 +56,4 @@ t(6) = dassert(ismonthly(date_6),false); t(7) = dassert(ismonthly(date_7),false); t(8) = dassert(ismonthly(date_8),false); T = all(t); -%@eof:1 \ No newline at end of file +%@eof:1 diff --git a/src/utilities/is/isquarterly.m b/src/utilities/is/isquarterly.m index fc46cb55066e0193307994c1a7bbeeab11925a99..4b4e3cb8b074e9767820143c691eda2fa46d9478 100644 --- a/src/utilities/is/isquarterly.m +++ b/src/utilities/is/isquarterly.m @@ -1,4 +1,4 @@ -function b = isquarterly(str) % --*-- Unitary tests --*-- +function b = isquarterly(str) % Tests if the input can be interpreted as a quarterly date. % @@ -8,7 +8,7 @@ function b = isquarterly(str) % --*-- Unitary tests --*-- % OUTPUTS % o b integer scalar, equal to 1 if str can be interpreted as a quarterly date or 0 otherwise. -% Copyright © 2012-2021 Dynare Team +% Copyright © 2012-2023 Dynare Team % % This file is part of Dynare. % @@ -35,7 +35,7 @@ else b = false; end -return +return % --*-- Unit tests --*-- %@test:1 date_1 = '1950Q2'; @@ -54,4 +54,4 @@ t(5) = dassert(isquarterly(date_5),false); t(6) = dassert(isquarterly(date_6),false); t(7) = dassert(isquarterly(date_7),false); T = all(t); -%@eof:1 \ No newline at end of file +%@eof:1 diff --git a/src/utilities/is/isstringdate.m b/src/utilities/is/isstringdate.m index 53b46d946842b611f89a28bada9090f34567783d..4f21c912926c5ce948579a16c935840e684152dc 100644 --- a/src/utilities/is/isstringdate.m +++ b/src/utilities/is/isstringdate.m @@ -1,4 +1,4 @@ -function b = isstringdate(str) % --*-- Unitary tests --*-- +function b = isstringdate(str) % Tests if the input string can be interpreted as a date. % @@ -8,7 +8,7 @@ function b = isstringdate(str) % --*-- Unitary tests --*-- % OUTPUTS % o b integer scalar, equal to 1 if str can be interpreted as a date or 0 otherwise. -% Copyright © 2013-2021 Dynare Team +% Copyright © 2013-2023 Dynare Team % % This file is part of Dynare. % @@ -31,7 +31,7 @@ else b = false; end -return +return % --*-- Unit tests --*-- %@test:1 date_1 = '1950M2'; @@ -77,4 +77,4 @@ t(19) = ~isstringdate(date_19); t(20) = isstringdate(date_20); T = all(t); -%@eof:1 \ No newline at end of file +%@eof:1 diff --git a/src/utilities/is/issubperiod.m b/src/utilities/is/issubperiod.m index ec38a97bdbe21e23db06329217067e5d11277ada..9a85e6512120673bd170a92ad08bb7d5743c3737 100644 --- a/src/utilities/is/issubperiod.m +++ b/src/utilities/is/issubperiod.m @@ -1,6 +1,6 @@ -function C = issubperiod(A,B) % --*-- Unitary tests --*-- +function C = issubperiod(A,B) -% Copyright © 2013-2021 Dynare Team +% Copyright © 2013-2023 Dynare Team % % This file is part of Dynare. % @@ -27,7 +27,7 @@ else error('issubperiod:: Second input argument must be equal to 1, 2, 4, 12 or 52 (frequency)!') end -return +return % --*-- Unit tests --*-- %@test:1 try @@ -87,4 +87,4 @@ if t(1) end T = all(t); -%@eof:4 \ No newline at end of file +%@eof:4 diff --git a/src/utilities/is/isvalidday.m b/src/utilities/is/isvalidday.m index 717642bf938a9b92df8c1c14d713b52cd95616f5..8c702dcc9f4c36f529257207bab3da30d0497c9c 100644 --- a/src/utilities/is/isvalidday.m +++ b/src/utilities/is/isvalidday.m @@ -1,4 +1,4 @@ -function b = isvalidday(day) % --*-- Unitary tests --*-- +function b = isvalidday(day) % Tests if the input can be interpreted as a daily date. % @@ -8,7 +8,7 @@ function b = isvalidday(day) % --*-- Unitary tests --*-- % OUTPUTS % - b [logical] scalar, equal to true iff day can be interpreted as a daily date. -% Copyright © 2020 Dynare Team +% Copyright © 2020-2023 Dynare Team % % This file is part of Dynare. % @@ -61,7 +61,7 @@ end b = true; -return +return % --*-- Unit tests --*-- %@test:1 t(1) = isvalidday([2000,1,1]) && isvalidday([2000,1,31]) && ~isvalidday([2000, 1, 32]); @@ -81,4 +81,4 @@ t(14) = ~isvalidday([2000, 1, 0]); t(15) = ~isvalidday([2000, 0, 1]); t(16) = isvalidday([0, 1, 1]); T = all(t); -%@eof:1 \ No newline at end of file +%@eof:1 diff --git a/src/utilities/is/isweekly.m b/src/utilities/is/isweekly.m index 75f31debb3ea7007e6817fc651396cd221a4b99a..c9da49e32e8b62eccc5b9f073a90da30f9b187e7 100644 --- a/src/utilities/is/isweekly.m +++ b/src/utilities/is/isweekly.m @@ -1,4 +1,4 @@ -function b = isweekly(str) % --*-- Unitary tests --*-- +function b = isweekly(str) % Tests if the input can be interpreted as a monthly date. % @@ -8,7 +8,7 @@ function b = isweekly(str) % --*-- Unitary tests --*-- % OUTPUTS % o b logical scalar, equal to true if str can be interpreted as a weekly date or false otherwise. -% Copyright © 2021 Dynare Team +% Copyright © 2021-2023 Dynare Team % % This file is part of Dynare. % @@ -46,7 +46,7 @@ if b end -return +return % --*-- Unit tests --*-- %@test:1 date_1 = '1950M2'; @@ -71,4 +71,4 @@ t(8) = ~isweekly(date_8); t(9) = ~isweekly(date_9); t(10) = isweekly(date_10); T = all(t); -%@eof:1 \ No newline at end of file +%@eof:1 diff --git a/src/utilities/is/isyearly.m b/src/utilities/is/isyearly.m index 812a1efdbf543cf70a7374a747a79b168b030511..d253c1e8c0112a4dbf322dbdf8b960c63532f5c6 100644 --- a/src/utilities/is/isyearly.m +++ b/src/utilities/is/isyearly.m @@ -1,4 +1,4 @@ -function b = isyearly(str) % --*-- Unitary tests --*-- +function b = isyearly(str) % Tests if the input can be interpreted as a yearly date. % @@ -8,7 +8,7 @@ function b = isyearly(str) % --*-- Unitary tests --*-- % OUTPUTS % o b integer scalar, equal to 1 if str can be interpreted as a yearly date or 0 otherwise. -% Copyright © 2012-2021 Dynare Team +% Copyright © 2012-2023 Dynare Team % % This file is part of Dynare. % @@ -35,7 +35,7 @@ else b = false; end -return +return % --*-- Unit tests --*-- %@test:1 date_1 = '1950M2'; @@ -56,4 +56,4 @@ t(6) = dassert(isyearly(date_6),true); t(7) = dassert(isyearly(date_7),true); t(8) = dassert(isyearly(date_8),false); T = all(t); -%@eof:1 \ No newline at end of file +%@eof:1 diff --git a/src/utilities/misc/dummy.m b/src/utilities/misc/dummy.m index ea642a501f2b8bb96b961c1a9411a918457b5046..0eb0399bcee2aca9d48721076692dc93be5b78fe 100644 --- a/src/utilities/misc/dummy.m +++ b/src/utilities/misc/dummy.m @@ -1,4 +1,4 @@ -function o = dummy(iperiod, len, subperiod, name) % --*-- Unitary tests --*-- +function o = dummy(iperiod, len, subperiod, name) % Returns a dummy in a dseries object. % @@ -11,7 +11,7 @@ function o = dummy(iperiod, len, subperiod, name) % --*-- Unitary tests --*-- % OUTPUTS % - o [dseries] -% Copyright © 2022 Dynare Team +% Copyright © 2022-2023 Dynare Team % % This file is part of Dynare. % @@ -53,7 +53,7 @@ end o = dseries(d, iperiod, name); -return +return % --*-- Unit tests --*-- %@test:1 try @@ -98,4 +98,4 @@ if t(1) end T = all(t); -%@eof:3 \ No newline at end of file +%@eof:3 diff --git a/src/utilities/misc/firstdayofyear.m b/src/utilities/misc/firstdayofyear.m index 6eff5b25fc5b2ba8fcfc74d76d013ceb1ad00b51..3bda9477b09586cf0bef2ec95d26f2ab2e0388fe 100644 --- a/src/utilities/misc/firstdayofyear.m +++ b/src/utilities/misc/firstdayofyear.m @@ -1,4 +1,4 @@ -function daycode = firstdayofyear(y) % --*-- Unitary tests --*-- +function daycode = firstdayofyear(y) % Returns the first day of year y. % @@ -19,7 +19,7 @@ function daycode = firstdayofyear(y) % --*-- Unitary tests --*-- % 6 -> Saturday % 7 -> Sunday -% Copyright © 2021 Dynare Team +% Copyright © 2021-2023 Dynare Team % % This file is part of Dynare. % @@ -42,7 +42,7 @@ daycode = mod(1+5*mod(y-1,4)+4*mod(y-1,100)+6*mod(y-1,400), 7); id = (daycode==0); daycode(id) = 7; -return +return % --*-- Unit tests --*-- %@test:1 try @@ -72,4 +72,4 @@ if t(1) end T = all(t); -%@eof:2 \ No newline at end of file +%@eof:2 diff --git a/src/utilities/misc/firstweekofyear.m b/src/utilities/misc/firstweekofyear.m index 3455144ef2347a641fef96f3b144856bb4ff035b..fe7a1b80a32a30aa5d52777375a6c3a024b05dab 100644 --- a/src/utilities/misc/firstweekofyear.m +++ b/src/utilities/misc/firstweekofyear.m @@ -1,16 +1,16 @@ -function [d, m, y] = firstweekofyear(y) % --*-- Unitary tests --*-- +function [d, m, y] = firstweekofyear(y) % Returns the month and day the first week of the year. % -% INPUTS +% INPUTS % - y [integer] the year. % -% OUTPUS +% OUTPUS % - y [integer] the year of the first iso-8601 week of year y (may be equal to y-1) % - m [integer] the month number (1 or 12) % - d [integer] the day of the month. -% Copyright © 2021 Dynare Team +% Copyright © 2021-2023 Dynare Team % % This file is part of Dynare. % @@ -45,7 +45,7 @@ if any(id) d(id) = 9-d(id); end -return +return % --*-- Unit tests --*-- %@test:1 t = false(2,1); @@ -84,8 +84,8 @@ if t(1) t(7) = m(3)==12; t(8) = y(1)==1972; t(9) = y(2)==1973; - t(10) = y(3)==1973; + t(10) = y(3)==1973; end T = all(t); -%@eof:2 \ No newline at end of file +%@eof:2 diff --git a/src/utilities/misc/weeksince.m b/src/utilities/misc/weeksince.m index 830d347ebbd749f7bad879a75d13432e34a1051e..1723bde75745427a4a662786c3929405bb3edf6b 100644 --- a/src/utilities/misc/weeksince.m +++ b/src/utilities/misc/weeksince.m @@ -1,16 +1,16 @@ -function o = weeksince(y, w, z) % --*-- Unitary tests --*-- +function o = weeksince(y, w, z) % Returns the number of ISO weeks since base year z. % -% INPUTS +% INPUTS % - y [integer] scalar or vector, the year. % - w [integer] scalar or vector, the week. % - z [integer] scalar, base year. % -% OUTPUTS +% OUTPUTS % - o [integer] scalar or vector, number of weeks. -% Copyright © 2021 Dynare Team +% Copyright © 2021-2023 Dynare Team % % This file is part of Dynare. % @@ -41,7 +41,7 @@ end o = 52*(y-z)+n+w; -return +return % --*-- Unit tests --*-- %@test:1 try @@ -116,4 +116,4 @@ if t(1) end T = all(t); -%@eof:5 \ No newline at end of file +%@eof:5 diff --git a/src/utilities/missing/isint/isint.m b/src/utilities/missing/isint/isint.m index 7b550cc3f31233ce488b1d329320debf3c3fbeb3..40a0d2f4b03f5c6aa446eed45dd42449f6fe524b 100644 --- a/src/utilities/missing/isint/isint.m +++ b/src/utilities/missing/isint/isint.m @@ -1,4 +1,4 @@ -function [l,c,d] = isint(a) % --*-- Unitary tests --*-- +function [l,c,d] = isint(a) % This function tests if the input argument is an integer. % @@ -13,7 +13,7 @@ function [l,c,d] = isint(a) % --*-- Unitary tests --*-- % REMARKS % p+q is equal to the product of m by n. -% Copyright © 2009-2021 Dynare Team +% Copyright © 2009-2023 Dynare Team % % This code is free software: you can redistribute it and/or modify % it under the terms of the GNU General Public License as published by @@ -44,7 +44,7 @@ if nargout>1 d = find(l==false); end -return +return % --*-- Unit tests --*-- %@test:1 a = 1938; @@ -128,4 +128,4 @@ if t(1) end T = all(t); -%@eof:5 \ No newline at end of file +%@eof:5 diff --git a/src/utilities/missing/shiftS/shiftS.m b/src/utilities/missing/shiftS/shiftS.m index 2f8fd1dfc171d818fb895e2f294a4b1c3a13751a..349355fd306b68f9fde2fa5293de39bbc29d8d35 100644 --- a/src/utilities/missing/shiftS/shiftS.m +++ b/src/utilities/missing/shiftS/shiftS.m @@ -1,8 +1,8 @@ -function S = shiftS(S,n) % --*-- Unitary tests --*-- +function S = shiftS(S,n) % Removes the first n elements of a one dimensional cell array. -% Copyright © 2009-2019 Dynare Team +% Copyright © 2009-2023 Dynare Team % % This code is free software: you can redistribute it and/or modify % it under the terms of the GNU General Public License as published by @@ -23,7 +23,7 @@ else S = {}; end -return +return % --*-- Unit tests --*-- %@test:1 Cell = {'1', '2', '3'}; diff --git a/src/utilities/op/add_periods_to_array_of_dates.m b/src/utilities/op/add_periods_to_array_of_dates.m index ae43ad2418543d88983173c73cbe0e9571be844a..eba7cd988fe402466209286673552f66f14d3756 100644 --- a/src/utilities/op/add_periods_to_array_of_dates.m +++ b/src/utilities/op/add_periods_to_array_of_dates.m @@ -1,8 +1,8 @@ -function time = add_periods_to_array_of_dates(time, freq, p) % --*-- Unitary tests --*-- +function time = add_periods_to_array_of_dates(time, freq, p) % Adds a p periods (p can be negative) to a date (or a set of dates) characterized by array time and frequency freq. -% Copyright © 2013-2020 Dynare Team +% Copyright © 2013-2023 Dynare Team % % This file is part of Dynare. % @@ -43,7 +43,7 @@ if ~isempty(id2) time(id2,2) = time(id2,2) + freq; end -return +return % --*-- Unit tests --*-- %@test:1 t(1) = isequal(add_periods_to_array_of_dates([1950 1], 4, 1),[1950 2]); @@ -87,4 +87,4 @@ t(6) = isequal(add_periods_to_array_of_dates([1950 1], 4, -6),[1948 3]); t(7) = isequal(add_periods_to_array_of_dates([1950 1], 4, -7),[1948 2]); t(8) = isequal(add_periods_to_array_of_dates([1950 1], 4, -8),[1948 1]); T = all(t); -%@eof:6 \ No newline at end of file +%@eof:6 diff --git a/src/utilities/op/add_periods_to_date.m b/src/utilities/op/add_periods_to_date.m index 57887d57aa30907084fd8caf286558a892fb6277..f549ec8ee6a34a99861ef6ee99f63135ed2a6caf 100644 --- a/src/utilities/op/add_periods_to_date.m +++ b/src/utilities/op/add_periods_to_date.m @@ -1,8 +1,8 @@ -function time = add_periods_to_date(time, freq, p) % --*-- Unitary tests --*-- +function time = add_periods_to_date(time, freq, p) % Adds a p periods (p can be negative) to a date (or a set of dates) characterized by array time and frequency freq. -% Copyright © 2013-2017 Dynare Team +% Copyright © 2013-2023 Dynare Team % % This file is part of Dynare. % @@ -36,7 +36,7 @@ if time(2)<1 time(2) = time(2) + freq; end -return +return % --*-- Unit tests --*-- %@test:1 t(1) = dassert(add_periods_to_date([1950 1], 4, 1),[1950 2]); @@ -60,4 +60,4 @@ t(6) = dassert(add_periods_to_date([1950 1], 4, -6),[1948 3]); t(7) = dassert(add_periods_to_date([1950 1], 4, -7),[1948 2]); t(8) = dassert(add_periods_to_date([1950 1], 4, -8),[1948 1]); T = all(t); -%@eof:2 \ No newline at end of file +%@eof:2 diff --git a/src/utilities/str/name2tex.m b/src/utilities/str/name2tex.m index 2fd60c07691300806bd1a1fe6e2bdf861135d357..be4316a9d7c91cfa0968edf470b8b80893fbee15 100644 --- a/src/utilities/str/name2tex.m +++ b/src/utilities/str/name2tex.m @@ -1,4 +1,4 @@ -function tex = name2tex(name, info) % --*-- Unitary tests --*-- +function tex = name2tex(name, info) % Converts plain text name into tex name. % @@ -11,7 +11,7 @@ function tex = name2tex(name, info) % --*-- Unitary tests --*-- % OUTPUTS % - tex [string or cell of strings] -% Copyright © 2012-2021 Dynare Team +% Copyright © 2012-2023 Dynare Team % % This code is free software: you can redistribute it and/or modify % it under the terms of the GNU General Public License as published by @@ -80,7 +80,7 @@ if info end end -return +return % --*-- Unit tests --*-- %@test:1 t = zeros(16,1); diff --git a/src/utilities/x13/checkcommandcompatibility.m b/src/utilities/x13/checkcommandcompatibility.m index 9c5aa1a466450393f792d3f2deaddf1af1afeeca..fe395d3537955570f4fdd2ce1bd84b03e3ee006b 100644 --- a/src/utilities/x13/checkcommandcompatibility.m +++ b/src/utilities/x13/checkcommandcompatibility.m @@ -1,8 +1,8 @@ -function checkcommandcompatibility(o, comm) % --*-- Unitary tests --*-- +function checkcommandcompatibility(o, comm) % Checks for compatibility of X13 commands. -% Copyright © 2017-2021 Dynare Team +% Copyright © 2017-2023 Dynare Team % % This code is free software: you can redistribute it and/or modify % it under the terms of the GNU General Public License as published by @@ -39,7 +39,7 @@ switch comm otherwise end -return +return % --*-- Unit tests --*-- %@test:1 t = zeros(2,1); @@ -63,4 +63,4 @@ catch end T = all(t); -%@eof:1 \ No newline at end of file +%@eof:1 diff --git a/src/utilities/x13/checkoptioncompatibility.m b/src/utilities/x13/checkoptioncompatibility.m index 155e510fff487dd24f19b7c372b9530f8d96653e..3f0f9c23bae6b6c272f383aec4feedd448ad18ed 100644 --- a/src/utilities/x13/checkoptioncompatibility.m +++ b/src/utilities/x13/checkoptioncompatibility.m @@ -1,8 +1,8 @@ -function checkoptioncompatibility(o) % --*-- Unitary tests --*-- +function checkoptioncompatibility(o) % Checks for compatibility of options in different X13 commands. -% Copyright © 2017-2021 Dynare Team +% Copyright © 2017-2023 Dynare Team % % This code is free software: you can redistribute it and/or modify % it under the terms of the GNU General Public License as published by @@ -37,7 +37,7 @@ if ~isempty(o.estimate.file) end end -return +return % --*-- Unit tests --*-- %@test:1 t = zeros(3,1); @@ -68,4 +68,4 @@ catch end T = all(t); -%@eof:1 \ No newline at end of file +%@eof:1 diff --git a/src/utilities/x13/isoption.m b/src/utilities/x13/isoption.m index 4568db85b97437ebb1374bd91585c3ae9f61e4aa..79637c7c12cb55c02dca735477d3a573d917d444 100644 --- a/src/utilities/x13/isoption.m +++ b/src/utilities/x13/isoption.m @@ -1,6 +1,6 @@ -function b = isoption(command, option) % --*-- Unitary tests --*-- +function b = isoption(command, option) -% Copyright © 2017-2021 Dynare Team +% Copyright © 2017-2023 Dynare Team % % This code is free software: you can redistribute it and/or modify % it under the terms of the GNU General Public License as published by @@ -79,7 +79,7 @@ switch command error('x13:isoption: Unknown block!') end -return +return % --*-- Unit tests --*-- %@test:1 try @@ -97,4 +97,4 @@ b = isoption('arima','ar'); c = ~isoption('arima','unicorn'); t = [b;c]; T = all(t); -%@eof:2 \ No newline at end of file +%@eof:2 diff --git a/src/utilities/x13/printoption.m b/src/utilities/x13/printoption.m index e8f40555d8f3e6cf69f7e3cb7db6071d5d8f87cd..af5760b4941e20ee917b670b8839f07fef11afb1 100644 --- a/src/utilities/x13/printoption.m +++ b/src/utilities/x13/printoption.m @@ -1,6 +1,6 @@ -function printoption(fid, optname, optvalue) % --*-- Unitary tests --*-- +function printoption(fid, optname, optvalue) -% Copyright © 2017-2021 Dynare Team +% Copyright © 2017-2023 Dynare Team % % This code is free software: you can redistribute it and/or modify % it under the terms of the GNU General Public License as published by @@ -43,7 +43,7 @@ elseif isreal(optvalue) end end -return +return % --*-- Unit tests --*-- %@test:1 fid = fopen('test.spc', 'w'); @@ -60,4 +60,4 @@ catch end T = all(t); -%@eof:1 \ No newline at end of file +%@eof:1 diff --git a/src/utilities/x13/printspan.m b/src/utilities/x13/printspan.m index 8c5a794708272aac21e031dee9446d1c424f5087..d5ffabff1a9162527b06f488a1ae53c5c48d4308 100644 --- a/src/utilities/x13/printspan.m +++ b/src/utilities/x13/printspan.m @@ -1,6 +1,6 @@ -function printspan(fid, period1, period2) % --*-- Unitary tests --*-- +function printspan(fid, period1, period2) -% Copyright © 2017-2021 Dynare Team +% Copyright © 2017-2023 Dynare Team % % This code is free software: you can redistribute it and/or modify % it under the terms of the GNU General Public License as published by @@ -39,7 +39,7 @@ switch period1.freq error('x13:regression: This is a bug! Please contact the authors.') end -return +return % --*-- Unit tests --*-- %@test:1 try @@ -81,4 +81,4 @@ catch end T = all(t); -%@eof:3 \ No newline at end of file +%@eof:3 diff --git a/src/utilities/x13/printstart.m b/src/utilities/x13/printstart.m index 017c954ad8343d894d80690b58d12afa77118bf4..e94261a0801bb53f5871e2119ee3d6a38f00c455 100644 --- a/src/utilities/x13/printstart.m +++ b/src/utilities/x13/printstart.m @@ -1,4 +1,4 @@ -function printstart(fid, period) % --*-- Unitary tests --*-- +function printstart(fid, period) % Copyright © 2017-2021 Dynare Team % @@ -31,7 +31,7 @@ switch period.freq error('x13:regression: This frequency is not available in X-13 class.') end -return +return % --*-- Unit tests --*-- %@test:1 try @@ -44,4 +44,4 @@ catch end T = all(t); -%@eof:1 \ No newline at end of file +%@eof:1 diff --git a/src/utilities/x13/setdefaultmember.m b/src/utilities/x13/setdefaultmember.m index 07915d4e2727638fbee7503f795174f18bd295ef..1258913dc5511dfa9760d2c813f54e214c34a1b9 100644 --- a/src/utilities/x13/setdefaultmember.m +++ b/src/utilities/x13/setdefaultmember.m @@ -1,8 +1,8 @@ -function s = setdefaultmember(name) % --*-- Unitary tests --*-- +function s = setdefaultmember(name) % Sets members of X13 object to default values (empty). -% Copyright © 2017-2021 Dynare Team +% Copyright © 2017-2023 Dynare Team % % This code is free software: you can redistribute it and/or modify % it under the terms of the GNU General Public License as published by @@ -83,7 +83,7 @@ switch name error('x13:setdefaultmember: Unknown member!') end -return +return % --*-- Unit tests --*-- %@test:1 try @@ -94,4 +94,4 @@ catch end T = all(t); -%@eof:1 \ No newline at end of file +%@eof:1 diff --git a/tests/runalltests.m b/tests/runalltests.m index d29ab02751d6feb9f2fdc6073a4889def3706842..5231a87218bf4beb2deec70c723c98f8e536a1d4 100644 --- a/tests/runalltests.m +++ b/tests/runalltests.m @@ -1,6 +1,6 @@ function runalltests() -% Copyright © 2015-2022 Dynare Team +% Copyright © 2015-2023 Dynare Team % % This code is free software: you can redistribute it and/or modify % it under the terms of the GNU General Public License as published by @@ -50,7 +50,7 @@ if isoctave() addpath([unit_tests_root 'fake']); end -r = run_unitary_tests_in_directory(dseries_src_root(1:end-1)); +r = run_unit_tests_in_directory(dseries_src_root(1:end-1)); delete('*.log');