diff --git a/matlab/@dseries/minus.m b/matlab/@dseries/minus.m index a6b6f91e477285da4c5da9c7164cb9e38f86e8af..4f3309d8d2840a469350db34a5a348e9271fb120 100644 --- a/matlab/@dseries/minus.m +++ b/matlab/@dseries/minus.m @@ -98,7 +98,7 @@ A_vobs = max(vobs(B), vobs(C)); 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); @@ -126,7 +126,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 @@ -154,7 +154,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 ef6dc2d9f7f5969fc6aef1a20caac39c5fa8930f..283705243c4106c1144c118de0391c1b34cf98ba 100644 --- a/matlab/@dseries/mpower.m +++ b/matlab/@dseries/mpower.m @@ -65,7 +65,7 @@ if isdseries(B) && isnumeric(C) && isreal(C) && isscalar(C) A.name = cell(vobs(A),1); A.tex = cell(vobs(A),1); for i=1:vobs(A) - 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 return @@ -79,7 +79,7 @@ if isdseries(B) && isdseries(C) A.name = cell(vobs(A),1); A.tex = cell(vobs(A),1); for i=1:vobs(A) - 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 else @@ -112,7 +112,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); @@ -139,7 +139,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.^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); diff --git a/matlab/@dseries/mrdivide.m b/matlab/@dseries/mrdivide.m index 606cc3b212f30d340b605f9111458b9672c7e514..3d4377e82403b4810bfa9a781b7f0431ed7be11e 100644 --- a/matlab/@dseries/mrdivide.m +++ b/matlab/@dseries/mrdivide.m @@ -86,7 +86,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 d52117dca84fb319c2f668db1535c125c92d28f2..db5695aa02efa1eb149c0d1da8076af633b26818 100644 --- a/matlab/@dseries/mtimes.m +++ b/matlab/@dseries/mtimes.m @@ -86,7 +86,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); @@ -116,7 +116,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 ee3f0295c0422724ebf99f5a2777cd421b5773be..850d6ef1102243ec61dc8427d9a1eb7d847733b3 100644 --- a/matlab/@dseries/plus.m +++ b/matlab/@dseries/plus.m @@ -100,7 +100,7 @@ A_vobs = max(vobs(B), vobs(C)); 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 @@ -127,7 +127,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,{'plus(A1,B1)';'plus(A2,B1)'}); +%$ t(5) = dyn_assert(ts3.name,{'plus(A1;B1)';'plus(A2;B1)'}); %$ end %$ T = all(t); %@eof:1 @@ -156,7 +156,7 @@ end %$ 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 @@ -185,7 +185,7 @@ end %$ 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