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

Fix cherrypick routine. 

Was failing when model contain variable and parameter names ending with the name
of a built-in function.

Closes #1813
fix-tolerance-parameters
Stéphane Adjemian (Charybdis) 2022-04-17 10:14:15 +02:00
parent d1488bb55c
commit b9f7733c6b
Signed by: stepan
GPG Key ID: 295C1FE89E17EB3C
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
matlab/get_variables_and_parameters_in_expression.m
View File

@ -8,7 +8,7 @@ function objects = get_variables_and_parameters_in_expression(expr)
% OUTPUTS
% - objects [cell] cell of row char arrays, names of the variables and parameters in expr.
% Copyright © 2020-2021 Dynare Team
% Copyright © 2020-2022 Dynare Team
%
% This file is part of Dynare.
%
@ -37,15 +37,12 @@ end
% Filter out the numbers, punctuation.
objects(cellfun(@(x) all(isstrprop(x, 'digit')+isstrprop(x, 'punct')), objects)) = [];
% Filter out empty elements.
objects(cellfun(@(x) all(isempty(x)), objects)) = [];
% Filter out functions
objects(cellfun(@(x) ismember(x, {'log', 'log10', 'ln', 'exp', 'sqrt', 'abs', 'sign', 'sin', 'cos', 'tan', 'asin', 'acos', 'atan', 'min', 'max', 'normcdf', 'normpdf', 'erf', 'diff', 'adl'}), objects)) = [];
% Filter out empty elements.
objects(cellfun(@(x) all(isempty(x)), objects)) = [];
function o = splitexpr(expr)
o = strsplit(expr, {'+','-','*','/','^', ...
'log(', 'log10(', 'ln(', 'exp(', ...
'sqrt(', 'abs(', 'sign(', ...
'sin(', 'cos(', 'tan(', 'asin(', 'acos(', 'atan(', ...
'min(', 'max(', ...
'normcdf(', 'normpdf(', 'erf(', ...
'diff(', 'adl(', '(', ')', '\n', '\t', ' '});
function o = splitexpr(expr)
o = strsplit(expr, {'+','-','*','/','^', '(', ')', '\n', '\t', ' '});