From 5b31f8355a00f3607aebf28fd18ec3247a88e28b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Adjemian=20=28Charybdis=29?=
<stephane.adjemian@univ-lemans.fr>
Date: Thu, 15 May 2014 15:54:42 +0200
Subject: [PATCH] Use new leadlagtable's columns introduced in
d0708fcb2c978c7ae47aa8ab7cbdf6f2b162c123 (usefull for sparse dynamic models).
---
matlab/utilities/dseries/from.m | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/matlab/utilities/dseries/from.m b/matlab/utilities/dseries/from.m
index 49360fe576..033cfc558f 100644
--- a/matlab/utilities/dseries/from.m
+++ b/matlab/utilities/dseries/from.m
@@ -219,10 +219,12 @@ data = tmp.data;
% Transform EXPRESSION by replacing calls to the dseries objects by references to data.
for i=1:number_of_variables
EXPRESSION = regexprep(EXPRESSION,sprintf('%s\\(t\\)',leadlagtable{i,1}),sprintf('data(t,%s)',num2str(i)));
- for lag=1:leadlagtable{i,2}
+ for j=1:length(leadlagtable{i,5})
+ lag = leadlagtable{i,5}(j);
EXPRESSION = regexprep(EXPRESSION,sprintf('%s\\(t-%s\\)',leadlagtable{i,1},num2str(lag)),sprintf('data(t-%s,%s)',num2str(lag),num2str(i)));
end
- for lead=1:leadlagtable{i,4}
+ for j=1:length(leadlagtable{i,6})
+ lead = leadlagtable{i,6}(j);
EXPRESSION = regexprep(EXPRESSION,sprintf('%s\\(t+%s\\)',leadlagtable{i,1},num2str(lead)),sprintf('data(t+%s,%s)',num2str(lead),num2str(i)));
end
end
--
GitLab