diff --git a/matlab/@dseries/minus.m b/matlab/@dseries/minus.m index 6f7c47dbcb88211a3fbeadebc66c342a9dc7e006..1c0fff36426ebad04e169f952989e3b53e1aefc1 100644 --- a/matlab/@dseries/minus.m +++ b/matlab/@dseries/minus.m @@ -101,7 +101,7 @@ A.vobs = max(B.vobs,C.vobs); A.name = cell(A.vobs,1); A.tex = cell(A.vobs,1); for i=1:A.vobs - A.name(i) = {['minus(' B.name{idB(i)} ',' C.name{idC(i)} ')']}; + A.name(i) = {['minus(' B.name{idB(i)} ';' C.name{idC(i)} ')']}; A.tex(i) = {['(' B.tex{idB(i)} '-' C.tex{idC(i)} ')']}; end A.data = bsxfun(@minus,B.data,C.data); @@ -129,7 +129,7 @@ A.data = bsxfun(@minus,B.data,C.data); %$ 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); -%$ t(5) = dyn_assert(ts3.name,{'minus(A1,B1)';'minus(A2,B1)'}); +%$ t(5) = dyn_assert(ts3.name,{'minus(A1;B1)';'minus(A2;B1)'}); %$ end %$ T = all(t); %@eof:1 @@ -157,7 +157,7 @@ A.data = bsxfun(@minus,B.data,C.data); %$ 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,{'minus(A1,B1)';'minus(A2,B1)'}); +%$ t(5) = dyn_assert(ts3.name,{'minus(A1;B1)';'minus(A2;B1)'}); %$ end %$ T = all(t); %@eof:3 diff --git a/matlab/@dseries/mpower.m b/matlab/@dseries/mpower.m index 89b0b1049379c4da13f96c2c6b86b85d3d43d9cc..4ac1a7785f263e07ece14663499c10f2e4fad16e 100644 --- a/matlab/@dseries/mpower.m +++ b/matlab/@dseries/mpower.m @@ -50,7 +50,7 @@ if isdseries(B) && isnumeric(C) && isreal(C) && isscalar(C) A.name = cell(A.vobs,1); A.tex = cell(A.vobs,1); for i=1:A.vobs - A.name(i) = {['power(' B.name{i} ',' num2str(C) ')']}; + A.name(i) = {['power(' B.name{i} ';' num2str(C) ')']}; A.tex(i) = {[B.tex{i} '^' num2str(C) ]}; end A.data = B.data.^C; @@ -68,7 +68,7 @@ if isdseries(B) && isdseries(C) A.name = cell(A.vobs,1); A.tex = cell(A.vobs,1); for i=1:A.vobs - A.name(i) = {['power(' B.name{i} ',' C.name{i} ')']}; + A.name(i) = {['power(' B.name{i} ';' C.name{i} ')']}; A.tex(i) = {[B.tex{i} '^{' C.tex{i} '}']}; end A.data = B.data.^C.data; @@ -102,7 +102,7 @@ error(['dseries::mpower: Wrong calling sequence!']) %$ t(2) = dyn_assert(ts3.vobs,2); %$ t(3) = dyn_assert(ts3.nobs,10); %$ t(4) = dyn_assert(ts3.data,A.^B,1e-15); -%$ t(5) = dyn_assert(ts3.name,{'power(A1,B1)';'power(A2,B2)'}); +%$ t(5) = dyn_assert(ts3.name,{'power(A1;B1)';'power(A2;B2)'}); %$ t(6) = dyn_assert(ts3.tex,{'A1^{B1}';'A2^{B2}'}); %$ end %$ T = all(t); @@ -129,8 +129,8 @@ error(['dseries::mpower: Wrong calling sequence!']) %$ t(2) = dyn_assert(ts3.vobs,2); %$ t(3) = dyn_assert(ts3.nobs,10); %$ t(4) = dyn_assert(ts3.data,A.^2,1e-15); -%$ t(5) = dyn_assert(ts3.name,{'power(A1,2)';'power(A2,2)'}); +%$ t(5) = dyn_assert(ts3.name,{'power(A1;2)';'power(A2;2)'}); %$ t(6) = dyn_assert(ts3.tex,{'A1^2';'A2^2'}); %$ end %$ T = all(t); -%@eof:2 \ No newline at end of file +%@eof:2 diff --git a/matlab/@dseries/mrdivide.m b/matlab/@dseries/mrdivide.m index e42b47aa99c2702956d03bfe878fea5032251b50..bca279bc10f0107041943b1de50e1c72bd13d078 100644 --- a/matlab/@dseries/mrdivide.m +++ b/matlab/@dseries/mrdivide.m @@ -89,7 +89,7 @@ if isdseries(B) && isdseries(C) A.name = cell(A.vobs,1); A.tex = cell(A.vobs,1); for i=1:A.vobs - A.name(i) = {['divide(' B.name{idB(i)} ',' C.name{idC(i)} ')']}; + A.name(i) = {['divide(' B.name{idB(i)} ';' C.name{idC(i)} ')']}; A.tex(i) = {['(' B.tex{idB(i)} '/' C.tex{idC(i)} ')']}; end A.data = bsxfun(@rdivide,B.data,C.data); diff --git a/matlab/@dseries/mtimes.m b/matlab/@dseries/mtimes.m index 79f2019c2c423744e018c910fc664c48515ba437..c389520e8dafd5c22c6337c0b78252a975bfa49e 100644 --- a/matlab/@dseries/mtimes.m +++ b/matlab/@dseries/mtimes.m @@ -89,7 +89,7 @@ if isdseries(B) && isdseries(C) A.name = cell(A.vobs,1); A.tex = cell(A.vobs,1); for i=1:A.vobs - A.name(i) = {['multiply(' B.name{idB(i)} ',' C.name{idC(i)} ')']}; + A.name(i) = {['multiply(' B.name{idB(i)} ';' C.name{idC(i)} ')']}; A.tex(i) = {['(' B.tex{idB(i)} '*' C.tex{idC(i)} ')']}; end A.data = bsxfun(@times,B.data,C.data); @@ -119,7 +119,7 @@ end %$ 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); -%$ t(5) = dyn_assert(ts3.name,{'multiply(A1,B1)';'multiply(A2,B1)'}); +%$ t(5) = dyn_assert(ts3.name,{'multiply(A1;B1)';'multiply(A2;B1)'}); %$ end %$ T = all(t); %@eof:1 diff --git a/matlab/@dseries/plus.m b/matlab/@dseries/plus.m index b9d20a798be05b117f67c00c325947a72a6db1cb..21a389d8e375ad1a555316c2472978db9409fb4e 100644 --- a/matlab/@dseries/plus.m +++ b/matlab/@dseries/plus.m @@ -100,7 +100,7 @@ A.vobs = max(B.vobs,C.vobs); 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.name(i) = {['plus(' B.name{idB(i)} ';' C.name{idC(i)} ')']}; A.tex(i) = {['(' B.tex{idB(i)} '+' C.tex{idC(i)} ')']}; end A.data = bsxfun(@plus,B.data,C.data); @@ -129,7 +129,7 @@ A.dates = A.init:A.init+(A.nobs-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); -%$ t(5) = dyn_assert(ts3.name,{'plus(A1,B1)';'plus(A2,B1)'}); +%$ t(5) = dyn_assert(ts3.name,{'plus(A1;B1)';'plus(A2;B1)'}); %$ end %$ T = all(t); %@eof:1 @@ -158,7 +158,7 @@ A.dates = A.init:A.init+(A.nobs-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)'}); +%$ t(5) = dyn_assert(ts4.name,{'plus(plus(A1;B1);A1)';'plus(plus(A2;B1);A2)'}); %$ end %$ T = all(t); %@eof:2 @@ -187,7 +187,7 @@ A.dates = A.init:A.init+(A.nobs-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)'}); +%$ t(5) = dyn_assert(ts3.name,{'plus(A1;B1)';'plus(A2;B1)'}); %$ end %$ T = all(t); %@eof:3 @@ -288,4 +288,4 @@ A.dates = A.init:A.init+(A.nobs-1); %$ end %$ %$ T = all(t); -%@eof:7 \ No newline at end of file +%@eof:7