diff --git a/src/@dates/uminus.m b/src/@dates/uminus.m index 3785e11d9ccbd32a79da1af6f1a84a7e31181a8f..f8357a18fb7bfbcfd5f1c15c7062ea4aae36f949 100644 --- a/src/@dates/uminus.m +++ b/src/@dates/uminus.m @@ -1,23 +1,21 @@ -function B = uminus(A) % --*-- Unitary tests --*-- +function o = uminus(o) % --*-- Unitary tests --*-- % Overloads the unary minus operator for dates objects. Shifts all the elements by one period. % % INPUTS -% o A dates object with n elements. +% - o [dates] % % OUTPUTS -% o B dates object with n elements. +% - o [dates] -% Copyright (C) 2013 Dynare Team +% Copyright (C) 2013-2014 Dynare Team % -% This file is part of Dynare. -% -% Dynare is free software: you can redistribute it and/or modify +% 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 % 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, +% Dynare dates submodule 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. @@ -25,11 +23,10 @@ function B = uminus(A) % --*-- Unitary tests --*-- % You should have received a copy of the GNU General Public License % along with Dynare. If not, see <http://www.gnu.org/licenses/>. -B = dates(A); -B.time(:,2) = B.time(:,2)-1; -idx = find(B.time(:,2)==0); -B.time(idx,1) = B.time(idx,1)-1; -B.time(idx,2) = B.freq; +o.time(:,2) = o.time(:,2)-1; +idx = find(o.time(:,2)==0); +o.time(idx,1) = o.time(idx,1)-1; +o.time(idx,2) = o.freq; %@test:1 %$ % Define some dates @@ -40,11 +37,11 @@ B.time(idx,2) = B.freq; %$ date_5 = '1950M1'; %$ %$ % Call the tested routine. -%$ d1 = dates(date_1); d1 = -d1; -%$ d2 = dates(date_2); d2 = -d2; -%$ d3 = dates(date_3); d3 = -d3; -%$ d4 = dates(date_4); d4 = -d4; -%$ d5 = dates(date_5); d5 = -d5; +%$ d1 = dates(date_1); -d1; +%$ d2 = dates(date_2); -d2; +%$ d3 = dates(date_3); -d3; +%$ d4 = dates(date_4); -d4; +%$ d5 = dates(date_5); -d5; %$ i1 = (d1==dates('1949Y')); %$ i2 = (d2==dates('1950Q1')); %$ i3 = (d3==dates('1949Q4')); @@ -64,14 +61,14 @@ B.time(idx,2) = B.freq; %$ d1 = dates('1950Q1','1950Q2','1950Q3','1950Q4','1951Q1'); %$ d2 = dates('1949Q4','1950Q1','1950Q2','1950Q3','1950Q4'); %$ try -%$ d3 = -d1; +%$ -d1; %$ t(1) = 1; %$ catch %$ t(1) = 0; %$ end %$ %$ if t(1) -%$ t(2) = dassert(all(d2==d3),true); +%$ t(2) = dassert(all(d2==d1),true); %$ end %$ %$ T = all(t); diff --git a/src/@dates/uplus.m b/src/@dates/uplus.m index 12aa0ff91ef562d2811bdfd0c3230ddbbfaeec60..1d35c8cb4e5518856dbac09237a9a74e04402ebb 100644 --- a/src/@dates/uplus.m +++ b/src/@dates/uplus.m @@ -1,23 +1,21 @@ -function B = uplus(A) % --*-- Unitary tests --*-- +function o = uplus(o) % --*-- Unitary tests --*-- % Overloads the unary plus operator for dates objects. Shifts all the elements by one period. % % INPUTS -% o A dates object with n elements. +% - o [dates] % % OUTPUTS -% o B dates object with n elements. +% - o [dates] -% Copyright (C) 2013 Dynare Team +% Copyright (C) 2013-2014 Dynare Team % -% This file is part of Dynare. -% -% Dynare is free software: you can redistribute it and/or modify +% 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 % 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, +% Dynare dates submodule 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. @@ -25,11 +23,10 @@ function B = uplus(A) % --*-- Unitary tests --*-- % You should have received a copy of the GNU General Public License % along with Dynare. If not, see <http://www.gnu.org/licenses/>. -B = dates(A); -B.time(:,2) = B.time(:,2)+1; -idx = find(B.time(:,2)>B.freq); % Happy new year! -B.time(idx,1) = B.time(idx,1)+1; -B.time(idx,2) = 1; +o.time(:,2) = o.time(:,2)+1; +idx = find(o.time(:,2)>o.freq); % Happy new year! +o.time(idx,1) = o.time(idx,1)+1; +o.time(idx,2) = 1; %@test:1 %$ % Define some dates @@ -40,11 +37,11 @@ B.time(idx,2) = 1; %$ date_5 = '1950M12'; %$ %$ % Call the tested routine. -%$ d1 = dates(date_1); d1 = +d1; -%$ d2 = dates(date_2); d2 = +d2; -%$ d3 = dates(date_3); d3 = +d3; -%$ d4 = dates(date_4); d4 = +d4; -%$ d5 = dates(date_5); d5 = +d5; +%$ d1 = dates(date_1); +d1; +%$ d2 = dates(date_2); +d2; +%$ d3 = dates(date_3); +d3; +%$ d4 = dates(date_4); +d4; +%$ d5 = dates(date_5); +d5; %$ i1 = (d1==dates('1951Y')); %$ i2 = (d2==dates('1950Q3')); %$ i3 = (d3==dates('1951Q1')); @@ -64,14 +61,14 @@ B.time(idx,2) = 1; %$ d1 = dates('1950Q1','1950Q2','1950Q3','1950Q4','1951Q1'); %$ d2 = dates('1950Q2','1950Q3','1950Q4','1951Q1','1951Q2'); %$ try -%$ d3 = +d1; +%$ +d1; %$ t(1) = 1; %$ catch %$ t(1) = 0; %$ end %$ %$ if t(1) -%$ t(2) = dassert(all(d2==d3),true); +%$ t(2) = dassert(all(d2==d1),true); %$ end %$ %$ T = all(t);