From 3e51d2ff51cf47448e3d6ddeaa80af9b3e0195e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Adjemian=28Charybdis=29?= <stephane.adjemian@univ-lemans.fr> Date: Sat, 9 Jun 2018 18:23:00 +0200 Subject: [PATCH] Fixed ops member. --- src/@dseries/lag_.m | 10 +++++++--- src/@dseries/lead_.m | 12 ++++++++---- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/@dseries/lag_.m b/src/@dseries/lag_.m index 1cd1a05..7c90ad4 100644 --- a/src/@dseries/lag_.m +++ b/src/@dseries/lag_.m @@ -65,9 +65,13 @@ o.data = [NaN(p, vobs(o)); o.data(1:end-p,:)]; for i=1:vobs(o) if isempty(o.ops) - o.ops(i) = {sprintf('lag(%s, %s)', o.name{i}, p)}; + o.ops(i) = {sprintf('lag(%s, %s)', o.name{i}, int2str(p))}; else - o.ops(i) = {sprintf('lag(%s, %s)', o.ops{i}, p)}; + if isempty(o.ops{i}) + o.ops(i) = {sprintf('lag(%s)', int2str(p))}; + else + o.ops(i) = {sprintf('lag(%s, %s)', o.ops{i}, int2str(p))}; + end end end @@ -101,7 +105,7 @@ end %$ %$ if t(1) %$ t(2) = dassert(ts.data,data,1e-15); -%$ t(3) = isempty(ts.ops) +%$ t(3) = isempty(ts.ops{1}); %$ end %$ %$ T = all(t); diff --git a/src/@dseries/lead_.m b/src/@dseries/lead_.m index 2c5aebe..a762691 100644 --- a/src/@dseries/lead_.m +++ b/src/@dseries/lead_.m @@ -64,10 +64,14 @@ end o.data = [ o.data(p+1:end,:); NaN(p, vobs(o));]; for i=1:vobs(o) - if isempty(o.ops{i}) - o.ops(i) = {sprintf('lead(%s, %s)', o.name{i}, p)}; + if isempty(o.ops) + o.ops(i) = {sprintf('lead(%s, %s)', o.name{i}, int2str(p))}; else - o.ops(i) = {sprintf('lead(%s, %s)', o.ops{i}, p)}; + if isempty(o.ops{i}) + o.ops(i) = {sprintf('lead(%s)', int2str(p))}; + else + o.ops(i) = {sprintf('lead(%s, %s)', o.ops{i}, int2str(p))}; + end end end @@ -118,7 +122,7 @@ end %$ %$ if t(1) %$ t(2) = dassert(ts.data,data,1e-15); -%$ t(3) = isempty(ts.ops) +%$ t(3) = isempty(ts.ops{1}); %$ end %$ %$ T = all(t); -- GitLab