stepan
/
dynare
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow log(-X) or diff(-X) on the LHS.

time-shift
Stéphane Adjemian (Charybdis) 2019-09-30 22:38:40 +02:00
parent 5d8babb15c
commit fd2cb24911
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
matlab/aggregate.m
View File

@ -213,17 +213,23 @@ function [lhs, rhs] = getequation(str)
terms = strsplit(str, {'=',';'});
terms(cellfun(@(x) all(isempty(x)), terms)) = [];
terms(1) = {strrep(terms{1}, ' ', '')};
lhs = regexp(terms{1}, '^(diff\(\w*\)|log\(\w*\)|diff\(diff\(\w*\)\)|diff\(log\(\w*\)\)|diff\(diff\(log\(\w*\)\)\)|\w*)', 'match');
lhs = regexp(terms{1}, '^(diff\((log|diff)\([\-\+\*\/\w]*\)\)|(log|diff)\([\-\+\*\/\w]*\)|\w*)', 'match');
if ~isempty(lhs)
lhs = lhs{1};
if isequal(lhs, 'log')
error('Malformed equation: log of log or diff are not allowed.')
end
rhs = terms{2};
else
error('Malformed equation.')
end
function v = getendovar(lhs)
v = strsplit(lhs, {'diff','log','(',')'});
v = strsplit(lhs, {'diff','log','(',')', '+', '-', '*', '/'});
v(cellfun(@(x) all(isempty(x)), v)) = [];
if length(v)>1
error('Malformed equation: no more than one endogenous variable can be used on the LHS.')
end
function [v, t] = getvarandtag(str)
tmp = regexp(str, '(?<name>\w+)\s*(?<tag>\(.*\))', 'names');