From 615d47f72980bed48c2cf7c6491bcfdef863ee67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Adjemia=20=28Scylla=29?= Date: Thu, 16 Aug 2018 16:18:02 +0200 Subject: [PATCH] =?UTF-8?q?Fixed=20renaming=20issue=20with=20+,=20*=20and?= =?UTF-8?q?=20/=20binary=20operators=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Occuring when one of the inputs is not a dseries object. (cherry picked from commit 5ac7ea053a682d8c86ecede0fcdbd1377e92a196) --- src/@dseries/mrdivide.m | 2 +- src/@dseries/mtimes.m | 2 +- src/@dseries/plus.m | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/@dseries/mrdivide.m b/src/@dseries/mrdivide.m index 201cfd2..eaa28d4 100644 --- a/src/@dseries/mrdivide.m +++ b/src/@dseries/mrdivide.m @@ -30,7 +30,7 @@ if isnumeric(o) && (isscalar(o) || isvector(o)) if ~isdseries(p) error('dseries::mrdivide: Second input argument must be a dseries object!') end - q = dseries(zeros(size(p.data)), p.firstdate); + q = copy(p); q.data = bsxfun(@rdivide, o, p.data); for i=1:vobs(q) if isscalar(o) diff --git a/src/@dseries/mtimes.m b/src/@dseries/mtimes.m index cb5fdbe..8512a4d 100644 --- a/src/@dseries/mtimes.m +++ b/src/@dseries/mtimes.m @@ -30,7 +30,7 @@ if isnumeric(o) && (isscalar(o) || isvector(o)) if ~isdseries(p) error('dseries::mtimes: Second input argument must be a dseries object!') end - q = dseries(zeros(size(p.data)), p.firstdate); + q = copy(p); q.data = bsxfun(@times, o, p.data); for i=1:vobs(q) if isscalar(o) diff --git a/src/@dseries/plus.m b/src/@dseries/plus.m index e5a9584..638d0a1 100644 --- a/src/@dseries/plus.m +++ b/src/@dseries/plus.m @@ -30,7 +30,7 @@ if isnumeric(o) && (isscalar(o) || isvector(o)) if ~isdseries(p) error('dseries::plus: Second input argument must be a dseries object!') end - q = dseries(zeros(size(p.data)), p.firstdate); + q = copy(p); q.data = bsxfun(@plus, o, p.data); for i=1:vobs(q) if isscalar(o) -- 2.24.1