From 2d87a8c0e704914e691f3695a02ee80ad16fd83e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Adjemian=20=28Scylla=29?=
<stephane.adjemian@univ-lemans.fr>
Date: Tue, 29 Jul 2014 18:22:10 +0200
Subject: [PATCH] This fixes #704.
(manually cherry picked from commit 0f28422e9fdb4281e565bdf0f7edd3e2b1677652)
Conflicts:
matlab/@dseries/minus.m
matlab/@dseries/mpower.m
matlab/@dseries/mrdivide.m
matlab/@dseries/mtimes.m
matlab/@dseries/plus.m
---
matlab/@dseries/minus.m | 6 +++---
matlab/@dseries/mpower.m | 10 +++++-----
matlab/@dseries/mrdivide.m | 2 +-
matlab/@dseries/mtimes.m | 4 ++--
matlab/@dseries/plus.m | 10 +++++-----
5 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/matlab/@dseries/minus.m b/matlab/@dseries/minus.m
index 6f7c47dbc..1c0fff364 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 89b0b1049..4ac1a7785 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 e42b47aa9..bca279bc1 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 79f2019c2..c389520e8 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 b9d20a798..21a389d8e 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
--
GitLab