diff --git a/src/@dates/ndat.m b/src/@dates/ndat.m index e29310fb1e449b8b9becfbed4d8015fac129d56c..7b8fb41a067db1c1e0f7ec9cee0794edb6771469 100644 --- a/src/@dates/ndat.m +++ b/src/@dates/ndat.m @@ -8,7 +8,7 @@ function s = ndat(o) % --*-- Unitary tests --*-- % OUTPUTS % - s [integer] -% Copyright (C) 2015-2017 Dynare Team +% Copyright © 2015-2020 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,74 +25,58 @@ function s = ndat(o) % --*-- Unitary tests --*-- s = size(o.time, 1); +return + %@test:1 -%$ % Define a dates object -%$ o = dates('1950Q1'):dates('1952Q1'); -%$ -%$ % Call the tested routine. -%$ try -%$ card = ndat(o); -%$ t(1) = true; -%$ catch -%$ t(1) = false; -%$ end -%$ -%$ if t(1) -%$ t(2) = dassert(card,9); -%$ end -%$ T = all(t); +% Define a dates object +o = dates('1950Q1'):dates('1952Q1'); + +% Call the tested routine. +try + card = ndat(o); + t(1) = true; +catch + t(1) = false; +end + +if t(1) + t(2) = dassert(card,9); +end +T = all(t); %@eof:1 %@test:2 -%$ % Define a dates object -%$ o = dates('1950M1'):dates('1951M6'); -%$ -%$ % Call the tested routine. -%$ try -%$ card = ndat(o); -%$ t(1) = true; -%$ catch -%$ t(1) = false; -%$ end -%$ -%$ if t(1) -%$ t(2) = dassert(card,18); -%$ end -%$ T = all(t); +% Define a dates object +o = dates('1950M1'):dates('1951M6'); + +% Call the tested routine. +try + card = ndat(o); + t(1) = true; +catch + t(1) = false; +end + +if t(1) + t(2) = dassert(card,18); +end +T = all(t); %@eof:2 %@test:3 -%$ % Define a dates object -%$ o = dates('1950W1'):dates('1950W16'); -%$ -%$ % Call the tested routine. -%$ try -%$ card = ndat(o); -%$ t(1) = true; -%$ catch -%$ t(1) = false; -%$ end -%$ -%$ if t(1) -%$ t(2) = dassert(card,16); -%$ end -%$ T = all(t); -%@eof:3 +% Define a dates object +o = dates('1950Y'):dates('1959Y'); + +% Call the tested routine. +try + card = ndat(o); + t(1) = true; +catch + t(1) = false; +end -%@test:4 -%$ % Define a dates object -%$ o = dates('1950Y'):dates('1959Y'); -%$ -%$ % Call the tested routine. -%$ try -%$ card = ndat(o); -%$ t(1) = true; -%$ catch -%$ t(1) = false; -%$ end -%$ -%$ if t(1) -%$ t(2) = dassert(card,10); -%$ end -%$ T = all(t); -%@eof:4 +if t(1) + t(2) = dassert(card,10); +end +T = all(t); +%@eof:3 \ No newline at end of file