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

PAC: minor simplification in the matching of the growth expression 

Simple variable nodes are already correctly matched by
ExprNode::matchLinearCombinationOfVariables().

Also improve the related documentation.
pac-components
Sébastien Villemot 2021-12-03 15:48:22 +01:00
parent 7dde09169e
commit 6a31ba4b62
No known key found for this signature in database
GPG Key ID: 2CECE9350ECEBE4A
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ExprNode.hh
View File

@ -632,7 +632,9 @@ public:
parameter in a term, param_id == -1.
Can throw a MatchFailureException.
if `variable_obligatory_in_each_term` is true, then every part of the linear combination must contain a variable;
otherwise, if `variable_obligatory_in_each_term`, then any linear combination of constant/variable/param is matched
otherwise, if `variable_obligatory_in_each_term` is false, then any linear
combination of constant/variable/param is matched (and variable_id == -1
for terms without a variable).
*/
vector<tuple<int, int, int, double>> matchLinearCombinationOfVariables(bool variable_obligatory_in_each_term = true) const;

10
src/SubModel.cc
View File

@ -830,14 +830,8 @@ PacModelTable::transformPass(ExprNode::subst_table_t &diff_subst_table,
}
catch (ExprNode::MatchFailureException &e)
{
auto gv = dynamic_cast<const VariableNode *>(growth[name]);
if (gv)
growth_info[name].emplace_back(gv->symb_id, gv->lag, -1, 1);
else
{
cerr << "Pac growth must be a linear combination of variables" << endl;
exit(EXIT_FAILURE);
}
cerr << "ERROR: PAC growth must be a linear combination of variables" << endl;
exit(EXIT_FAILURE);
}
// Collect some information about PAC models

3
src/SubModel.hh
View File

@ -199,6 +199,9 @@ private:
map<string, string> discount;
// The growth expressions belong to the main dynamic_model from the ModFile instance
map<string, expr_t> growth, original_growth;
/* Information about the structure of growth expressions (which must be a
linear combination of variables).
Each tuple represents a term: (endo_id, lag, param_id, constant) */
map<string, vector<tuple<int, int, int, double>>> growth_info;
/* Stores the name of the PAC equation associated to the model.