2013-09-05 11:34:19 +02:00
|
|
|
function A = plus(B,C) % --*-- Unitary tests --*--
|
|
|
|
|
2012-12-08 14:18:01 +01:00
|
|
|
%@info:
|
|
|
|
%! @deftypefn {Function File} {@var{A} =} plus (@var{B},@var{C})
|
2013-10-18 17:38:43 +02:00
|
|
|
%! @anchor{@dseries/plus}
|
2012-12-08 14:18:01 +01:00
|
|
|
%! @sp 1
|
2013-10-18 17:38:43 +02:00
|
|
|
%! Overloads the plus method for the Dynare time series class (@ref{dseries}).
|
2012-12-08 14:18:01 +01:00
|
|
|
%! @sp 2
|
|
|
|
%! @strong{Inputs}
|
|
|
|
%! @sp 1
|
|
|
|
%! @table @ @var
|
|
|
|
%! @item B
|
2013-10-18 17:38:43 +02:00
|
|
|
%! Dynare time series object instantiated by @ref{dseries}.
|
2012-12-08 14:18:01 +01:00
|
|
|
%! @item C
|
2013-10-18 17:38:43 +02:00
|
|
|
%! Dynare time series object instantiated by @ref{dseries}.
|
2012-12-08 14:18:01 +01:00
|
|
|
%! @end table
|
|
|
|
%! @sp 1
|
|
|
|
%! @strong{Outputs}
|
|
|
|
%! @sp 1
|
|
|
|
%! @table @ @var
|
|
|
|
%! @item A
|
|
|
|
%! Dynare time series object.
|
|
|
|
%! @end deftypefn
|
|
|
|
%@eod:
|
|
|
|
|
2013-06-12 16:42:09 +02:00
|
|
|
% Copyright (C) 2011-2013 Dynare Team
|
2012-12-08 14:18:01 +01:00
|
|
|
%
|
|
|
|
% 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 <http://www.gnu.org/licenses/>.
|
|
|
|
|
2013-07-18 20:50:32 +02:00
|
|
|
if isscalar(B)
|
2013-11-06 22:43:43 +01:00
|
|
|
if ~isdseries(C)
|
|
|
|
error('dseries::plus: Second input argument must be a dseries object!')
|
|
|
|
end
|
2013-07-18 20:50:32 +02:00
|
|
|
b(1:size(C)) = B;
|
2013-11-06 17:41:11 +01:00
|
|
|
BB = dseries(b, C.dates(1));
|
2013-07-18 20:50:32 +02:00
|
|
|
BB.freq = C.freq;
|
2013-11-06 17:41:11 +01:00
|
|
|
BB.dates = C.dates;
|
2013-07-18 20:50:32 +02:00
|
|
|
BB.nobs = C.nobs;
|
|
|
|
BB.vobs = C.vobs;
|
|
|
|
BB.name = cell(BB.vobs,1);
|
|
|
|
BB.tex = cell(BB.vobs,1);
|
|
|
|
BB.name(1) = {num2str(B)};
|
|
|
|
A = BB + C;
|
|
|
|
return;
|
|
|
|
end
|
|
|
|
|
|
|
|
if isscalar(C)
|
2013-11-06 22:43:43 +01:00
|
|
|
if ~isdseries(B)
|
|
|
|
error('dseries::plus: First input argument must be a dseries object!')
|
|
|
|
end
|
2013-07-18 20:50:32 +02:00
|
|
|
c(1:size(C)) = C;
|
2013-11-06 17:41:11 +01:00
|
|
|
CC = dseries(C, B.dates(1));
|
2013-07-18 20:50:32 +02:00
|
|
|
CC.freq = B.freq;
|
2013-11-06 17:41:11 +01:00
|
|
|
CC.dates = B.dates;
|
2013-07-18 20:50:32 +02:00
|
|
|
CC.nobs = B.nobs;
|
|
|
|
CC.vobs = B.vobs;
|
|
|
|
CC.name = cell(CC.vobs,1);
|
|
|
|
CC.tex = cell(CC.vobs,1);
|
|
|
|
CC.name(1) = {num2str(C)};
|
|
|
|
A = B + CC;
|
2013-11-06 22:43:43 +01:00
|
|
|
return
|
2013-07-18 20:50:32 +02:00
|
|
|
end
|
|
|
|
|
2012-12-08 14:18:01 +01:00
|
|
|
if ~isequal(B.vobs,C.vobs) && ~(isequal(B.vobs,1) || isequal(C.vobs,1))
|
2013-10-18 17:38:43 +02:00
|
|
|
error(['dseries::plus: Cannot add ' inputname(1) ' and ' inputname(2) ' (wrong number of variables)!'])
|
2013-03-21 13:19:06 +01:00
|
|
|
else
|
|
|
|
if B.vobs>C.vobs
|
|
|
|
idB = 1:B.vobs;
|
2013-10-07 17:16:47 +02:00
|
|
|
idC = ones(1,B.vobs);
|
2013-03-21 13:19:06 +01:00
|
|
|
elseif B.vobs<C.vobs
|
|
|
|
idB = ones(1,C.vobs);
|
|
|
|
idC = 1:C.vobs;
|
|
|
|
else
|
|
|
|
idB = 1:B.vobs;
|
|
|
|
idC = 1:C.vobs;
|
|
|
|
end
|
2012-12-08 14:18:01 +01:00
|
|
|
end
|
|
|
|
|
|
|
|
if ~isequal(B.freq,C.freq)
|
2013-10-18 17:38:43 +02:00
|
|
|
error(['dseries::plus: Cannot add ' inputname(1) ' and ' inputname(2) ' (frequencies are different)!'])
|
2012-12-08 14:18:01 +01:00
|
|
|
end
|
|
|
|
|
2013-04-12 17:48:00 +02:00
|
|
|
if ~isequal(B.nobs,C.nobs) || ~isequal(B.init,C.init)
|
|
|
|
[B, C] = align(B, C);
|
2012-12-08 14:18:01 +01:00
|
|
|
end
|
|
|
|
|
|
|
|
if isempty(B)
|
|
|
|
A = C;
|
|
|
|
return
|
|
|
|
end
|
|
|
|
|
|
|
|
if isempty(C)
|
|
|
|
A = B;
|
|
|
|
return
|
|
|
|
end
|
|
|
|
|
2013-10-18 17:38:43 +02:00
|
|
|
A = dseries();
|
2012-12-08 14:18:01 +01:00
|
|
|
|
|
|
|
A.freq = B.freq;
|
2012-12-08 14:26:24 +01:00
|
|
|
A.init = B.init;
|
2012-12-08 14:18:01 +01:00
|
|
|
A.nobs = max(B.nobs,C.nobs);
|
|
|
|
A.vobs = max(B.vobs,C.vobs);
|
2013-03-21 13:19:06 +01:00
|
|
|
A.name = cell(A.vobs,1);
|
|
|
|
A.tex = cell(A.vobs,1);
|
|
|
|
for i=1:A.vobs
|
|
|
|
A.name(i) = {['plus(' B.name{idB(i)} ',' C.name{idC(i)} ')']};
|
|
|
|
A.tex(i) = {['(' B.tex{idB(i)} '+' C.tex{idC(i)} ')']};
|
|
|
|
end
|
2012-12-08 14:18:01 +01:00
|
|
|
A.data = bsxfun(@plus,B.data,C.data);
|
2013-11-06 17:41:11 +01:00
|
|
|
A.dates = A.init:A.init+(A.nobs-1);
|
2012-12-08 14:18:01 +01:00
|
|
|
|
2012-12-08 14:27:40 +01:00
|
|
|
%@test:1
|
2012-12-08 14:18:01 +01:00
|
|
|
%$ % Define a datasets.
|
|
|
|
%$ A = rand(10,2); B = randn(10,1);
|
|
|
|
%$
|
|
|
|
%$ % Define names
|
|
|
|
%$ A_name = {'A1';'A2'}; B_name = {'B1'};
|
|
|
|
%$
|
2013-03-21 13:19:06 +01:00
|
|
|
%$ t = zeros(5,1);
|
2012-12-08 14:18:01 +01:00
|
|
|
%$
|
|
|
|
%$ % Instantiate a time series object.
|
|
|
|
%$ try
|
2013-10-18 17:38:43 +02:00
|
|
|
%$ ts1 = dseries(A,[],A_name,[]);
|
|
|
|
%$ ts2 = dseries(B,[],B_name,[]);
|
2012-12-08 14:18:01 +01:00
|
|
|
%$ ts3 = ts1+ts2;
|
|
|
|
%$ t(1) = 1;
|
|
|
|
%$ catch
|
|
|
|
%$ t = 0;
|
|
|
|
%$ end
|
|
|
|
%$
|
|
|
|
%$ if length(t)>1
|
|
|
|
%$ t(2) = dyn_assert(ts3.vobs,2);
|
|
|
|
%$ t(3) = dyn_assert(ts3.nobs,10);
|
|
|
|
%$ t(4) = dyn_assert(ts3.data,[A(:,1)+B, A(:,2)+B],1e-15);
|
2013-03-21 13:19:06 +01:00
|
|
|
%$ t(5) = dyn_assert(ts3.name,{'plus(A1,B1)';'plus(A2,B1)'});
|
2012-12-08 14:18:01 +01:00
|
|
|
%$ end
|
|
|
|
%$ T = all(t);
|
2012-12-08 14:27:40 +01:00
|
|
|
%@eof:1
|
2013-03-21 13:19:06 +01:00
|
|
|
|
|
|
|
%@test:2
|
|
|
|
%$ % Define a datasets.
|
|
|
|
%$ A = rand(10,2); B = randn(10,1);
|
|
|
|
%$
|
|
|
|
%$ % Define names
|
|
|
|
%$ A_name = {'A1';'A2'}; B_name = {'B1'};
|
|
|
|
%$
|
|
|
|
%$ t = zeros(5,1);
|
|
|
|
%$
|
|
|
|
%$ % Instantiate a time series object.
|
|
|
|
%$ try
|
2013-10-18 17:38:43 +02:00
|
|
|
%$ ts1 = dseries(A,[],A_name,[]);
|
|
|
|
%$ ts2 = dseries(B,[],B_name,[]);
|
2013-03-21 13:19:06 +01:00
|
|
|
%$ ts3 = ts1+ts2;
|
|
|
|
%$ ts4 = ts3+ts1;
|
|
|
|
%$ t(1) = 1;
|
|
|
|
%$ catch
|
|
|
|
%$ t = 0;
|
|
|
|
%$ end
|
|
|
|
%$
|
|
|
|
%$ if length(t)>1
|
|
|
|
%$ t(2) = dyn_assert(ts4.vobs,2);
|
|
|
|
%$ t(3) = dyn_assert(ts4.nobs,10);
|
|
|
|
%$ t(4) = dyn_assert(ts4.data,[A(:,1)+B, A(:,2)+B]+A,1e-15);
|
|
|
|
%$ t(5) = dyn_assert(ts4.name,{'plus(plus(A1,B1),A1)';'plus(plus(A2,B1),A2)'});
|
|
|
|
%$ end
|
|
|
|
%$ T = all(t);
|
|
|
|
%@eof:2
|
2013-04-12 17:48:00 +02:00
|
|
|
|
|
|
|
|
|
|
|
%@test:3
|
|
|
|
%$ % Define a datasets.
|
|
|
|
%$ A = rand(10,2); B = randn(5,1);
|
|
|
|
%$
|
|
|
|
%$ % Define names
|
|
|
|
%$ A_name = {'A1';'A2'}; B_name = {'B1'};
|
|
|
|
%$
|
|
|
|
%$ t = zeros(5,1);
|
|
|
|
%$
|
|
|
|
%$ % Instantiate a time series object.
|
|
|
|
%$ try
|
2013-10-18 17:38:43 +02:00
|
|
|
%$ ts1 = dseries(A,[],A_name,[]);
|
|
|
|
%$ ts2 = dseries(B,[],B_name,[]);
|
2013-04-12 17:48:00 +02:00
|
|
|
%$ ts3 = ts1+ts2;
|
|
|
|
%$ t(1) = 1;
|
|
|
|
%$ catch
|
|
|
|
%$ t = 0;
|
|
|
|
%$ end
|
|
|
|
%$
|
|
|
|
%$ if length(t)>1
|
|
|
|
%$ t(2) = dyn_assert(ts3.vobs,2);
|
|
|
|
%$ t(3) = dyn_assert(ts3.nobs,10);
|
|
|
|
%$ t(4) = dyn_assert(ts3.data,[A(1:5,1)+B(1:5), A(1:5,2)+B(1:5) ; NaN(5,2)],1e-15);
|
|
|
|
%$ t(5) = dyn_assert(ts3.name,{'plus(A1,B1)';'plus(A2,B1)'});
|
|
|
|
%$ end
|
|
|
|
%$ T = all(t);
|
|
|
|
%@eof:3
|
2013-06-17 17:13:44 +02:00
|
|
|
|
|
|
|
%@test:4
|
|
|
|
%$ t = zeros(7,1);
|
|
|
|
%$
|
|
|
|
%$ try
|
2013-10-18 17:38:43 +02:00
|
|
|
%$ ts = dseries(transpose(1:5),'1950q1',{'Output'}, {'Y_t'});
|
|
|
|
%$ us = dseries(transpose(1:5),'1949q4',{'Consumption'}, {'C_t'});
|
2013-06-17 17:13:44 +02:00
|
|
|
%$ vs = ts+us;
|
|
|
|
%$ t(1) = 1;
|
|
|
|
%$ catch
|
|
|
|
%$ t = 0;
|
|
|
|
%$ end
|
|
|
|
%$
|
|
|
|
%$ if length(t)>1
|
|
|
|
%$ t(2) = dyn_assert(ts.freq,4);
|
|
|
|
%$ t(3) = dyn_assert(us.freq,4);
|
|
|
|
%$ t(4) = dyn_assert(ts.init.time,[1950, 1]);
|
|
|
|
%$ t(5) = dyn_assert(us.init.time,[1949, 4]);
|
|
|
|
%$ t(6) = dyn_assert(vs.init.time,[1949, 4]);
|
|
|
|
%$ t(7) = dyn_assert(vs.nobs,6);
|
|
|
|
%$ end
|
|
|
|
%$
|
|
|
|
%$ T = all(t);
|
|
|
|
%@eof:4
|
|
|
|
|
|
|
|
%@test:5
|
|
|
|
%$ t = zeros(7,1);
|
|
|
|
%$
|
|
|
|
%$ try
|
2013-10-18 17:38:43 +02:00
|
|
|
%$ ts = dseries(transpose(1:5),'1950q1',{'Output'}, {'Y_t'});
|
|
|
|
%$ us = dseries(transpose(1:7),'1950q1',{'Consumption'}, {'C_t'});
|
2013-06-17 17:13:44 +02:00
|
|
|
%$ vs = ts+us;
|
|
|
|
%$ t(1) = 1;
|
|
|
|
%$ catch
|
|
|
|
%$ t = 0;
|
|
|
|
%$ end
|
|
|
|
%$
|
|
|
|
%$ if length(t)>1
|
|
|
|
%$ t(2) = dyn_assert(ts.freq,4);
|
|
|
|
%$ t(3) = dyn_assert(us.freq,4);
|
|
|
|
%$ t(4) = dyn_assert(ts.init.time,[1950, 1]);
|
|
|
|
%$ t(5) = dyn_assert(us.init.time,[1950, 1]);
|
|
|
|
%$ t(6) = dyn_assert(vs.init.time,[1950, 1]);
|
|
|
|
%$ t(7) = dyn_assert(vs.nobs,7);
|
|
|
|
%$ end
|
|
|
|
%$
|
|
|
|
%$ T = all(t);
|
|
|
|
%@eof:5
|