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

pac: separate params into EC and AR

issue#70
Houtan Bastani 2018-05-04 15:25:37 +02:00
parent 1310ec3caa
commit 912261e5fc
3 changed files with 103 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/DynamicModel.cc
View File

@ -3564,10 +3564,11 @@ DynamicModel::walkPacParameters()
{ {
bool pac_encountered = false; bool pac_encountered = false;
pair<int, int> lhs (-1, -1); pair<int, int> lhs (-1, -1);
set<pair<int, pair<int, int> > > params_and_vals; set<pair<int, pair<int, int> > > params_and_vars;
equations[i]->walkPacParameters(pac_encountered, lhs, params_and_vals); set<pair<int, pair<int, int> > > ecm_params_and_vars;
equations[i]->walkPacParameters(pac_encountered, lhs, ecm_params_and_vars, params_and_vars);
if (pac_encountered) if (pac_encountered)
equations[i]->addParamInfoToPac(lhs, params_and_vals); equations[i]->addParamInfoToPac(lhs, ecm_params_and_vars, params_and_vars);
} }
} }

153
src/ExprNode.cc
View File

@ -612,12 +612,12 @@ NumConstNode::setVarExpectationIndex(map<string, pair<SymbolList, int> > &var_mo
} }
void void
NumConstNode::walkPacParameters(bool &pac_encountered, pair<int, int> &lhs, set<pair<int, pair<int, int> > > &params_and_vals) const NumConstNode::walkPacParameters(bool &pac_encountered, pair<int, int> &lhs, set<pair<int, pair<int, int> > > &ec_params_and_vars, set<pair<int, pair<int, int> > > &ar_params_and_vars) const
{ {
} }
void void
NumConstNode::addParamInfoToPac(pair<int, int> &lhs_arg, set<pair<int, pair<int, int> > > &params_and_vals_arg) NumConstNode::addParamInfoToPac(pair<int, int> &lhs_arg, set<pair<int, pair<int, int> > > &ec_params_and_vars_arg, set<pair<int, pair<int, int> > > &ar_params_and_vars_arg)
{ {
} }
@ -1752,12 +1752,12 @@ VariableNode::setVarExpectationIndex(map<string, pair<SymbolList, int> > &var_mo
} }
void void
VariableNode::walkPacParameters(bool &pac_encountered, pair<int, int> &lhs, set<pair<int, pair<int, int> > > &params_and_vals) const VariableNode::walkPacParameters(bool &pac_encountered, pair<int, int> &lhs, set<pair<int, pair<int, int> > > &ec_params_and_vars, set<pair<int, pair<int, int> > > &ar_params_and_vars) const
{ {
} }
void void
VariableNode::addParamInfoToPac(pair<int, int> &lhs_arg, set<pair<int, pair<int, int> > > &params_and_vals_arg) VariableNode::addParamInfoToPac(pair<int, int> &lhs_arg, set<pair<int, pair<int, int> > > &ec_params_and_vars_arg, set<pair<int, pair<int, int> > > &ar_params_and_vars_arg)
{ {
} }
@ -3269,15 +3269,15 @@ UnaryOpNode::setVarExpectationIndex(map<string, pair<SymbolList, int> > &var_mod
} }
void void
UnaryOpNode::walkPacParameters(bool &pac_encountered, pair<int, int> &lhs, set<pair<int, pair<int, int> > > &params_and_vals) const UnaryOpNode::walkPacParameters(bool &pac_encountered, pair<int, int> &lhs, set<pair<int, pair<int, int> > > &ec_params_and_vars, set<pair<int, pair<int, int> > > &ar_params_and_vars) const
{ {
arg->walkPacParameters(pac_encountered, lhs, params_and_vals); arg->walkPacParameters(pac_encountered, lhs, ec_params_and_vars, ar_params_and_vars);
} }
void void
UnaryOpNode::addParamInfoToPac(pair<int, int> &lhs_arg, set<pair<int, pair<int, int> > > &params_and_vals_arg) UnaryOpNode::addParamInfoToPac(pair<int, int> &lhs_arg, set<pair<int, pair<int, int> > > &ec_params_and_vars_arg, set<pair<int, pair<int, int> > > &ar_params_and_vars_arg)
{ {
arg->addParamInfoToPac(lhs_arg, params_and_vals_arg); arg->addParamInfoToPac(lhs_arg, ec_params_and_vars_arg, ar_params_and_vars_arg);
} }
void void
@ -4861,7 +4861,8 @@ BinaryOpNode::setVarExpectationIndex(map<string, pair<SymbolList, int> > &var_mo
void void
BinaryOpNode::walkPacParametersHelper(const expr_t arg1, const expr_t arg2, BinaryOpNode::walkPacParametersHelper(const expr_t arg1, const expr_t arg2,
pair<int, int> &lhs, pair<int, int> &lhs,
set<pair<int, pair<int, int> > > &params_and_vals) const set<pair<int, pair<int, int> > > &ec_params_and_vars,
set<pair<int, pair<int, int> > > &ar_params_and_vars) const
{ {
set<int> params; set<int> params;
arg1->collectVariables(eParameter, params); arg1->collectVariables(eParameter, params);
@ -4871,8 +4872,8 @@ BinaryOpNode::walkPacParametersHelper(const expr_t arg1, const expr_t arg2,
set<pair<int, int> > endogs; set<pair<int, int> > endogs;
arg2->collectDynamicVariables(eEndogenous, endogs); arg2->collectDynamicVariables(eEndogenous, endogs);
if (endogs.size() == 1) if (endogs.size() == 1)
params_and_vals.insert(make_pair(*(params.begin()), *(endogs.begin()))); ar_params_and_vars.insert(make_pair(*(params.begin()), *(endogs.begin())));
else if (endogs.size() == 2) else if (endogs.size() >= 2)
{ {
BinaryOpNode *testarg2 = dynamic_cast<BinaryOpNode *>(arg2); BinaryOpNode *testarg2 = dynamic_cast<BinaryOpNode *>(arg2);
if (testarg2 != NULL && testarg2->get_op_code() == oMinus) if (testarg2 != NULL && testarg2->get_op_code() == oMinus)
@ -4880,44 +4881,28 @@ BinaryOpNode::walkPacParametersHelper(const expr_t arg1, const expr_t arg2,
VariableNode *test_arg1 = dynamic_cast<VariableNode *>(testarg2->get_arg1()); VariableNode *test_arg1 = dynamic_cast<VariableNode *>(testarg2->get_arg1());
VariableNode *test_arg2 = dynamic_cast<VariableNode *>(testarg2->get_arg2()); VariableNode *test_arg2 = dynamic_cast<VariableNode *>(testarg2->get_arg2());
if (test_arg1 != NULL && test_arg2 != NULL && lhs.first != -1) if (test_arg1 != NULL && test_arg2 != NULL && lhs.first != -1)
{
int find_symb_id = -1;
try
{
// lhs is an aux var (diff)
find_symb_id = datatree.symbol_table.getOrigSymbIdForAuxVar(lhs.first);
}
catch (...)
{
//lhs is not an aux var
find_symb_id = lhs.first;
}
endogs.clear();
if (test_arg1->get_symb_id() == find_symb_id)
{ {
test_arg1->collectDynamicVariables(eEndogenous, endogs); test_arg1->collectDynamicVariables(eEndogenous, endogs);
params_and_vals.insert(make_pair(*(params.begin()), *(endogs.begin()))); ec_params_and_vars.insert(make_pair(*(params.begin()), *(endogs.begin())));
} endogs.clear();
else if (test_arg2->get_symb_id() == find_symb_id)
{
test_arg2->collectDynamicVariables(eEndogenous, endogs); test_arg2->collectDynamicVariables(eEndogenous, endogs);
params_and_vals.insert(make_pair(*(params.begin()), *(endogs.begin()))); ec_params_and_vars.insert(make_pair(*(params.begin()), *(endogs.begin())));
}
} }
} }
} }
} }
void void
BinaryOpNode::walkPacParameters(bool &pac_encountered, pair<int, int> &lhs, set<pair<int, pair<int, int> > > &params_and_vals) const BinaryOpNode::walkPacParameters(bool &pac_encountered, pair<int, int> &lhs, set<pair<int, pair<int, int> > > &ec_params_and_vars, set<pair<int, pair<int, int> > > &ar_params_and_vars) const
{ {
if (op_code == oTimes) if (op_code == oTimes)
{ {
int orig_params_and_vals_size = params_and_vals.size(); int orig_ar_params_and_vars_size = ar_params_and_vars.size();
walkPacParametersHelper(arg1, arg2, lhs, params_and_vals); int orig_ec_params_and_vars_size = ec_params_and_vars.size();
if ((int)params_and_vals.size() == orig_params_and_vals_size) walkPacParametersHelper(arg1, arg2, lhs, ec_params_and_vars, ar_params_and_vars);
walkPacParametersHelper(arg2, arg1, lhs, params_and_vals); if ((int)ar_params_and_vars.size() == orig_ar_params_and_vars_size
&& (int)ec_params_and_vars.size() == orig_ec_params_and_vars_size)
walkPacParametersHelper(arg2, arg1, lhs, ec_params_and_vars, ar_params_and_vars);
} }
else if (op_code == oEqual) else if (op_code == oEqual)
{ {
@ -4927,15 +4912,15 @@ BinaryOpNode::walkPacParameters(bool &pac_encountered, pair<int, int> &lhs, set<
lhs = *(general_lhs.begin()); lhs = *(general_lhs.begin());
} }
arg1->walkPacParameters(pac_encountered, lhs, params_and_vals); arg1->walkPacParameters(pac_encountered, lhs, ec_params_and_vars, ar_params_and_vars);
arg2->walkPacParameters(pac_encountered, lhs, params_and_vals); arg2->walkPacParameters(pac_encountered, lhs, ec_params_and_vars, ar_params_and_vars);
} }
void void
BinaryOpNode::addParamInfoToPac(pair<int, int> &lhs_arg, set<pair<int, pair<int, int> > > &params_and_vals_arg) BinaryOpNode::addParamInfoToPac(pair<int, int> &lhs_arg, set<pair<int, pair<int, int> > > &ec_params_and_vars_arg, set<pair<int, pair<int, int> > > &ar_params_and_vars_arg)
{ {
arg1->addParamInfoToPac(lhs_arg, params_and_vals_arg); arg1->addParamInfoToPac(lhs_arg, ec_params_and_vars_arg, ar_params_and_vars_arg);
arg2->addParamInfoToPac(lhs_arg, params_and_vals_arg); arg2->addParamInfoToPac(lhs_arg, ec_params_and_vars_arg, ar_params_and_vars_arg);
} }
void void
@ -5761,19 +5746,19 @@ TrinaryOpNode::setVarExpectationIndex(map<string, pair<SymbolList, int> > &var_m
} }
void void
TrinaryOpNode::walkPacParameters(bool &pac_encountered, pair<int, int> &lhs, set<pair<int, pair<int, int> > > &params_and_vals) const TrinaryOpNode::walkPacParameters(bool &pac_encountered, pair<int, int> &lhs, set<pair<int, pair<int, int> > > &ec_params_and_vars, set<pair<int, pair<int, int> > > &ar_params_and_vars) const
{ {
arg1->walkPacParameters(pac_encountered, lhs, params_and_vals); arg1->walkPacParameters(pac_encountered, lhs, ec_params_and_vars, ar_params_and_vars);
arg2->walkPacParameters(pac_encountered, lhs, params_and_vals); arg2->walkPacParameters(pac_encountered, lhs, ec_params_and_vars, ar_params_and_vars);
arg3->walkPacParameters(pac_encountered, lhs, params_and_vals); arg3->walkPacParameters(pac_encountered, lhs, ec_params_and_vars, ar_params_and_vars);
} }
void void
TrinaryOpNode::addParamInfoToPac(pair<int, int> &lhs_arg, set<pair<int, pair<int, int> > > &params_and_vals_arg) TrinaryOpNode::addParamInfoToPac(pair<int, int> &lhs_arg, set<pair<int, pair<int, int> > > &ec_params_and_vars_arg, set<pair<int, pair<int, int> > > &ar_params_and_vars_arg)
{ {
arg1->addParamInfoToPac(lhs_arg, params_and_vals_arg); arg1->addParamInfoToPac(lhs_arg, ec_params_and_vars_arg, ar_params_and_vars_arg);
arg2->addParamInfoToPac(lhs_arg, params_and_vals_arg); arg2->addParamInfoToPac(lhs_arg, ec_params_and_vars_arg, ar_params_and_vars_arg);
arg3->addParamInfoToPac(lhs_arg, params_and_vals_arg); arg3->addParamInfoToPac(lhs_arg, ec_params_and_vars_arg, ar_params_and_vars_arg);
} }
void void
@ -6204,17 +6189,17 @@ AbstractExternalFunctionNode::setVarExpectationIndex(map<string, pair<SymbolList
} }
void void
AbstractExternalFunctionNode::walkPacParameters(bool &pac_encountered, pair<int, int> &lhs, set<pair<int, pair<int, int> > > &params_and_vals) const AbstractExternalFunctionNode::walkPacParameters(bool &pac_encountered, pair<int, int> &lhs, set<pair<int, pair<int, int> > > &ec_params_and_vars, set<pair<int, pair<int, int> > > &ar_params_and_vars) const
{ {
for (vector<expr_t>::const_iterator it = arguments.begin(); it != arguments.end(); it++) for (vector<expr_t>::const_iterator it = arguments.begin(); it != arguments.end(); it++)
(*it)->walkPacParameters(pac_encountered, lhs, params_and_vals); (*it)->walkPacParameters(pac_encountered, lhs, ec_params_and_vars, ar_params_and_vars);
} }
void void
AbstractExternalFunctionNode::addParamInfoToPac(pair<int, int> &lhs_arg, set<pair<int, pair<int, int> > > &params_and_vals_arg) AbstractExternalFunctionNode::addParamInfoToPac(pair<int, int> &lhs_arg, set<pair<int, pair<int, int> > > &ec_params_and_vars_arg, set<pair<int, pair<int, int> > > &ar_params_and_vars_arg)
{ {
for (vector<expr_t>::const_iterator it = arguments.begin(); it != arguments.end(); it++) for (vector<expr_t>::const_iterator it = arguments.begin(); it != arguments.end(); it++)
(*it)->addParamInfoToPac(lhs_arg, params_and_vals_arg); (*it)->addParamInfoToPac(lhs_arg, ec_params_and_vars_arg, ar_params_and_vars_arg);
} }
void void
@ -7723,12 +7708,12 @@ VarExpectationNode::setVarExpectationIndex(map<string, pair<SymbolList, int> > &
} }
void void
VarExpectationNode::walkPacParameters(bool &pac_encountered, pair<int, int> &lhs, set<pair<int, pair<int, int> > > &params_and_vals) const VarExpectationNode::walkPacParameters(bool &pac_encountered, pair<int, int> &lhs, set<pair<int, pair<int, int> > > &ec_params_and_vars, set<pair<int, pair<int, int> > > &ar_params_and_vars) const
{ {
} }
void void
VarExpectationNode::addParamInfoToPac(pair<int, int> &lhs_arg, set<pair<int, pair<int, int> > > &params_and_vals_arg) VarExpectationNode::addParamInfoToPac(pair<int, int> &lhs_arg, set<pair<int, pair<int, int> > > &ec_params_and_vars_arg, set<pair<int, pair<int, int> > > &ar_params_and_vars_arg)
{ {
} }
@ -7820,29 +7805,42 @@ PacExpectationNode::writeOutput(ostream &output, ExprNodeOutputType output_type,
output << "M_.pac." << model_name << ".growth_neutrality_param_index = " output << "M_.pac." << model_name << ".growth_neutrality_param_index = "
<< datatree.symbol_table.getTypeSpecificID(growth_param_index) + 1 << ";" << endl; << datatree.symbol_table.getTypeSpecificID(growth_param_index) + 1 << ";" << endl;
output << "M_.pac." << model_name << ".equation_params = ["; output << "M_.pac." << model_name << ".ec.params = ";
for (set<pair<int, pair<int, int> > >::const_iterator it = params_and_vals.begin(); set<pair<int, pair<int, int> > >::const_iterator it = ec_params_and_vars.begin();
it != params_and_vals.end(); it++) output << datatree.symbol_table.getTypeSpecificID(it->first) + 1
<< ";" << endl
<< "M_.pac." << model_name << ".ec.vars = [";
for (set<pair<int, pair<int, int> > >::const_iterator it = ec_params_and_vars.begin();
it != ec_params_and_vars.end(); it++)
{ {
if (it != params_and_vals.begin()) if (it != ec_params_and_vars.begin())
output << " ";
output << datatree.symbol_table.getTypeSpecificID(it->first) + 1;
}
output << "];" << endl
<< "M_.pac." << model_name << ".equation_vars = [";
for (set<pair<int, pair<int, int> > >::const_iterator it = params_and_vals.begin();
it != params_and_vals.end(); it++)
{
if (it != params_and_vals.begin())
output << " "; output << " ";
output << datatree.symbol_table.getTypeSpecificID(it->second.first) + 1; output << datatree.symbol_table.getTypeSpecificID(it->second.first) + 1;
} }
output << "];" << endl output << "];" << endl
<< "M_.pac." << model_name << ".equation_var_lags = ["; << "M_.pac." << model_name << ".ar.params = [";
for (set<pair<int, pair<int, int> > >::const_iterator it = params_and_vals.begin(); for (set<pair<int, pair<int, int> > >::const_iterator it = ar_params_and_vars.begin();
it != params_and_vals.end(); it++) it != ar_params_and_vars.end(); it++)
{ {
if (it != params_and_vals.begin()) if (it != ar_params_and_vars.begin())
output << " ";
output << datatree.symbol_table.getTypeSpecificID(it->first) + 1;
}
output << "];" << endl
<< "M_.pac." << model_name << ".ar.vars = [";
for (set<pair<int, pair<int, int> > >::const_iterator it = ar_params_and_vars.begin();
it != ar_params_and_vars.end(); it++)
{
if (it != ar_params_and_vars.begin())
output << " ";
output << datatree.symbol_table.getTypeSpecificID(it->second.first) + 1;
}
output << "];" << endl
<< "M_.pac." << model_name << ".ar.lags = [";
for (set<pair<int, pair<int, int> > >::const_iterator it = ar_params_and_vars.begin();
it != ar_params_and_vars.end(); it++)
{
if (it != ar_params_and_vars.begin())
output << " "; output << " ";
output << it->second.second; output << it->second.second;
} }
@ -8147,13 +8145,13 @@ PacExpectationNode::writeJsonOutput(ostream &output,
} }
void void
PacExpectationNode::walkPacParameters(bool &pac_encountered, pair<int, int> &lhs, set<pair<int, pair<int, int> > > &params_and_vals) const PacExpectationNode::walkPacParameters(bool &pac_encountered, pair<int, int> &lhs, set<pair<int, pair<int, int> > > &ec_params_and_vars, set<pair<int, pair<int, int> > > &ar_params_and_vars) const
{ {
pac_encountered = true; pac_encountered = true;
} }
void void
PacExpectationNode::addParamInfoToPac(pair<int, int> &lhs_arg, set<pair<int, pair<int, int> > > &params_and_vals_arg) PacExpectationNode::addParamInfoToPac(pair<int, int> &lhs_arg, set<pair<int, pair<int, int> > > &ec_params_and_vars_arg, set<pair<int, pair<int, int> > > &ar_params_and_vars_arg)
{ {
if (lhs_arg.first == -1) if (lhs_arg.first == -1)
{ {
@ -8161,14 +8159,15 @@ PacExpectationNode::addParamInfoToPac(pair<int, int> &lhs_arg, set<pair<int, pai
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
if (params_and_vals_arg.size() != 3) if (ec_params_and_vars_arg.empty() || ar_params_and_vars_arg.empty())
{ {
cerr << "Pac Expectation: error in obtaining RHS parameters." << endl; cerr << "Pac Expectation: error in obtaining RHS parameters." << endl;
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
lhs_pac_var = lhs_arg; lhs_pac_var = lhs_arg;
params_and_vals = params_and_vals_arg; ar_params_and_vars = ar_params_and_vars_arg;
ec_params_and_vars = ec_params_and_vars_arg;
} }

42
src/ExprNode.hh
View File

@ -513,10 +513,10 @@ class ExprNode
virtual bool isVarModelReferenced(const string &model_info_name) const = 0; virtual bool isVarModelReferenced(const string &model_info_name) const = 0;
//! Fills parameter information related to PAC equation //! Fills parameter information related to PAC equation
virtual void walkPacParameters(bool &pac_encountered, pair<int, int> &lhs, set<pair<int, pair<int, int> > > &params_and_vals) const = 0; virtual void walkPacParameters(bool &pac_encountered, pair<int, int> &lhs, set<pair<int, pair<int, int> > > &ec_params_and_vars, set<pair<int, pair<int, int> > > &params_and_vars) const = 0;
//! Adds PAC equation param info to pac_expectation //! Adds PAC equation param info to pac_expectation
virtual void addParamInfoToPac(pair<int, int> &lhs_arg, set<pair<int, pair<int, int> > > &params_and_vals_arg) = 0; virtual void addParamInfoToPac(pair<int, int> &lhs_arg, set<pair<int, pair<int, int> > > &ec_params_and_vars_arg, set<pair<int, pair<int, int> > > &params_and_vars_arg) = 0;
//! Fills var_model info for pac_expectation node //! Fills var_model info for pac_expectation node
virtual void fillPacExpectationVarInfo(string &model_name_arg, vector<int> &lhs_arg, int max_lag_arg, vector<bool> &nonstationary_arg, int growth_symb_id_arg, int equation_number_arg) = 0; virtual void fillPacExpectationVarInfo(string &model_name_arg, vector<int> &lhs_arg, int max_lag_arg, vector<bool> &nonstationary_arg, int growth_symb_id_arg, int equation_number_arg) = 0;
@ -595,8 +595,8 @@ public:
virtual expr_t removeTrendLeadLag(map<int, expr_t> trend_symbols_map) const; virtual expr_t removeTrendLeadLag(map<int, expr_t> trend_symbols_map) const;
virtual bool isInStaticForm() const; virtual bool isInStaticForm() const;
virtual void setVarExpectationIndex(map<string, pair<SymbolList, int> > &var_model_info); virtual void setVarExpectationIndex(map<string, pair<SymbolList, int> > &var_model_info);
virtual void walkPacParameters(bool &pac_encountered, pair<int, int> &lhs, set<pair<int, pair<int, int> > > &params_and_vals) const; virtual void walkPacParameters(bool &pac_encountered, pair<int, int> &lhs, set<pair<int, pair<int, int> > > &ec_params_and_vars, set<pair<int, pair<int, int> > > &params_and_vars) const;
virtual void addParamInfoToPac(pair<int, int> &lhs_arg, set<pair<int, pair<int, int> > > &params_and_vals_arg); virtual void addParamInfoToPac(pair<int, int> &lhs_arg, set<pair<int, pair<int, int> > > &ec_params_and_vars_arg, set<pair<int, pair<int, int> > > &params_and_vars_arg);
virtual void fillPacExpectationVarInfo(string &model_name_arg, vector<int> &lhs_arg, int max_lag_arg, vector<bool> &nonstationary_arg, int growth_symb_id_arg, int equation_number_arg); virtual void fillPacExpectationVarInfo(string &model_name_arg, vector<int> &lhs_arg, int max_lag_arg, vector<bool> &nonstationary_arg, int growth_symb_id_arg, int equation_number_arg);
virtual bool isVarModelReferenced(const string &model_info_name) const; virtual bool isVarModelReferenced(const string &model_info_name) const;
virtual void getEndosAndMaxLags(map<string, int> &model_endos_and_lags) const; virtual void getEndosAndMaxLags(map<string, int> &model_endos_and_lags) const;
@ -682,8 +682,8 @@ public:
virtual expr_t removeTrendLeadLag(map<int, expr_t> trend_symbols_map) const; virtual expr_t removeTrendLeadLag(map<int, expr_t> trend_symbols_map) const;
virtual bool isInStaticForm() const; virtual bool isInStaticForm() const;
virtual void setVarExpectationIndex(map<string, pair<SymbolList, int> > &var_model_info); virtual void setVarExpectationIndex(map<string, pair<SymbolList, int> > &var_model_info);
virtual void walkPacParameters(bool &pac_encountered, pair<int, int> &lhs, set<pair<int, pair<int, int> > > &params_and_vals) const; virtual void walkPacParameters(bool &pac_encountered, pair<int, int> &lhs, set<pair<int, pair<int, int> > > &ec_params_and_vars, set<pair<int, pair<int, int> > > &params_and_vars) const;
virtual void addParamInfoToPac(pair<int, int> &lhs_arg, set<pair<int, pair<int, int> > > &params_and_vals_arg); virtual void addParamInfoToPac(pair<int, int> &lhs_arg, set<pair<int, pair<int, int> > > &ec_params_and_vars_arg, set<pair<int, pair<int, int> > > &params_and_vars_arg);
virtual void fillPacExpectationVarInfo(string &model_name_arg, vector<int> &lhs_arg, int max_lag_arg, vector<bool> &nonstationary_arg, int growth_symb_id_arg, int equation_number_arg); virtual void fillPacExpectationVarInfo(string &model_name_arg, vector<int> &lhs_arg, int max_lag_arg, vector<bool> &nonstationary_arg, int growth_symb_id_arg, int equation_number_arg);
virtual bool isVarModelReferenced(const string &model_info_name) const; virtual bool isVarModelReferenced(const string &model_info_name) const;
virtual void getEndosAndMaxLags(map<string, int> &model_endos_and_lags) const; virtual void getEndosAndMaxLags(map<string, int> &model_endos_and_lags) const;
@ -791,8 +791,8 @@ public:
virtual expr_t removeTrendLeadLag(map<int, expr_t> trend_symbols_map) const; virtual expr_t removeTrendLeadLag(map<int, expr_t> trend_symbols_map) const;
virtual bool isInStaticForm() const; virtual bool isInStaticForm() const;
virtual void setVarExpectationIndex(map<string, pair<SymbolList, int> > &var_model_info); virtual void setVarExpectationIndex(map<string, pair<SymbolList, int> > &var_model_info);
virtual void walkPacParameters(bool &pac_encountered, pair<int, int> &lhs, set<pair<int, pair<int, int> > > &params_and_vals) const; virtual void walkPacParameters(bool &pac_encountered, pair<int, int> &lhs, set<pair<int, pair<int, int> > > &ec_params_and_vars, set<pair<int, pair<int, int> > > &params_and_vars) const;
virtual void addParamInfoToPac(pair<int, int> &lhs_arg, set<pair<int, pair<int, int> > > &params_and_vals_arg); virtual void addParamInfoToPac(pair<int, int> &lhs_arg, set<pair<int, pair<int, int> > > &ec_params_and_vars_arg, set<pair<int, pair<int, int> > > &params_and_vars_arg);
virtual void fillPacExpectationVarInfo(string &model_name_arg, vector<int> &lhs_arg, int max_lag_arg, vector<bool> &nonstationary_arg, int growth_symb_id_arg, int equation_number_arg); virtual void fillPacExpectationVarInfo(string &model_name_arg, vector<int> &lhs_arg, int max_lag_arg, vector<bool> &nonstationary_arg, int growth_symb_id_arg, int equation_number_arg);
virtual bool isVarModelReferenced(const string &model_info_name) const; virtual bool isVarModelReferenced(const string &model_info_name) const;
virtual void getEndosAndMaxLags(map<string, int> &model_endos_and_lags) const; virtual void getEndosAndMaxLags(map<string, int> &model_endos_and_lags) const;
@ -877,7 +877,8 @@ public:
} }
void walkPacParametersHelper(const expr_t arg1, const expr_t arg2, void walkPacParametersHelper(const expr_t arg1, const expr_t arg2,
pair<int, int> &lhs, pair<int, int> &lhs,
set<pair<int, pair<int, int> > > &params_and_vals) const; set<pair<int, pair<int, int> > > &ec_params_and_vars,
set<pair<int, pair<int, int> > > &ar_params_and_vars) const;
virtual expr_t toStatic(DataTree &static_datatree) const; virtual expr_t toStatic(DataTree &static_datatree) const;
virtual void computeXrefs(EquationInfo &ei) const; virtual void computeXrefs(EquationInfo &ei) const;
virtual pair<int, expr_t> normalizeEquation(int symb_id_endo, vector<pair<int, pair<expr_t, expr_t> > > &List_of_Op_RHS) const; virtual pair<int, expr_t> normalizeEquation(int symb_id_endo, vector<pair<int, pair<expr_t, expr_t> > > &List_of_Op_RHS) const;
@ -922,8 +923,8 @@ public:
expr_t getNonZeroPartofEquation() const; expr_t getNonZeroPartofEquation() const;
virtual bool isInStaticForm() const; virtual bool isInStaticForm() const;
virtual void setVarExpectationIndex(map<string, pair<SymbolList, int> > &var_model_info); virtual void setVarExpectationIndex(map<string, pair<SymbolList, int> > &var_model_info);
virtual void walkPacParameters(bool &pac_encountered, pair<int, int> &lhs, set<pair<int, pair<int, int> > > &params_and_vals) const; virtual void walkPacParameters(bool &pac_encountered, pair<int, int> &lhs, set<pair<int, pair<int, int> > > &ec_params_and_vars, set<pair<int, pair<int, int> > > &params_and_vars) const;
virtual void addParamInfoToPac(pair<int, int> &lhs_arg, set<pair<int, pair<int, int> > > &params_and_vals_arg); virtual void addParamInfoToPac(pair<int, int> &lhs_arg, set<pair<int, pair<int, int> > > &ec_params_and_vars_arg, set<pair<int, pair<int, int> > > &ar_params_and_vars_arg);
virtual void fillPacExpectationVarInfo(string &model_name_arg, vector<int> &lhs_arg, int max_lag_arg, vector<bool> &nonstationary_arg, int growth_symb_id_arg, int equation_number_arg); virtual void fillPacExpectationVarInfo(string &model_name_arg, vector<int> &lhs_arg, int max_lag_arg, vector<bool> &nonstationary_arg, int growth_symb_id_arg, int equation_number_arg);
virtual bool isVarModelReferenced(const string &model_info_name) const; virtual bool isVarModelReferenced(const string &model_info_name) const;
virtual void getEndosAndMaxLags(map<string, int> &model_endos_and_lags) const; virtual void getEndosAndMaxLags(map<string, int> &model_endos_and_lags) const;
@ -1018,8 +1019,8 @@ public:
virtual expr_t removeTrendLeadLag(map<int, expr_t> trend_symbols_map) const; virtual expr_t removeTrendLeadLag(map<int, expr_t> trend_symbols_map) const;
virtual bool isInStaticForm() const; virtual bool isInStaticForm() const;
virtual void setVarExpectationIndex(map<string, pair<SymbolList, int> > &var_model_info); virtual void setVarExpectationIndex(map<string, pair<SymbolList, int> > &var_model_info);
virtual void walkPacParameters(bool &pac_encountered, pair<int, int> &lhs, set<pair<int, pair<int, int> > > &params_and_vals) const; virtual void walkPacParameters(bool &pac_encountered, pair<int, int> &lhs, set<pair<int, pair<int, int> > > &ec_params_and_vars, set<pair<int, pair<int, int> > > &params_and_vars) const;
virtual void addParamInfoToPac(pair<int, int> &lhs_arg, set<pair<int, pair<int, int> > > &params_and_vals_arg); virtual void addParamInfoToPac(pair<int, int> &lhs_arg, set<pair<int, pair<int, int> > > &ec_params_and_vars_arg, set<pair<int, pair<int, int> > > &params_and_vars_arg);
virtual void fillPacExpectationVarInfo(string &model_name_arg, vector<int> &lhs_arg, int max_lag_arg, vector<bool> &nonstationary_arg, int growth_symb_id_arg, int equation_number_arg); virtual void fillPacExpectationVarInfo(string &model_name_arg, vector<int> &lhs_arg, int max_lag_arg, vector<bool> &nonstationary_arg, int growth_symb_id_arg, int equation_number_arg);
virtual bool isVarModelReferenced(const string &model_info_name) const; virtual bool isVarModelReferenced(const string &model_info_name) const;
virtual void getEndosAndMaxLags(map<string, int> &model_endos_and_lags) const; virtual void getEndosAndMaxLags(map<string, int> &model_endos_and_lags) const;
@ -1122,8 +1123,8 @@ public:
virtual expr_t removeTrendLeadLag(map<int, expr_t> trend_symbols_map) const; virtual expr_t removeTrendLeadLag(map<int, expr_t> trend_symbols_map) const;
virtual bool isInStaticForm() const; virtual bool isInStaticForm() const;
virtual void setVarExpectationIndex(map<string, pair<SymbolList, int> > &var_model_info); virtual void setVarExpectationIndex(map<string, pair<SymbolList, int> > &var_model_info);
virtual void walkPacParameters(bool &pac_encountered, pair<int, int> &lhs, set<pair<int, pair<int, int> > > &params_and_vals) const; virtual void walkPacParameters(bool &pac_encountered, pair<int, int> &lhs, set<pair<int, pair<int, int> > > &ec_params_and_vars, set<pair<int, pair<int, int> > > &params_and_vars) const;
virtual void addParamInfoToPac(pair<int, int> &lhs_arg, set<pair<int, pair<int, int> > > &params_and_vals_arg); virtual void addParamInfoToPac(pair<int, int> &lhs_arg, set<pair<int, pair<int, int> > > &ec_params_and_vars_arg, set<pair<int, pair<int, int> > > &params_and_vars_arg);
virtual void fillPacExpectationVarInfo(string &model_name_arg, vector<int> &lhs_arg, int max_lag_arg, vector<bool> &nonstationary_arg, int growth_symb_id_arg, int equation_number_arg); virtual void fillPacExpectationVarInfo(string &model_name_arg, vector<int> &lhs_arg, int max_lag_arg, vector<bool> &nonstationary_arg, int growth_symb_id_arg, int equation_number_arg);
virtual bool isVarModelReferenced(const string &model_info_name) const; virtual bool isVarModelReferenced(const string &model_info_name) const;
virtual void getEndosAndMaxLags(map<string, int> &model_endos_and_lags) const; virtual void getEndosAndMaxLags(map<string, int> &model_endos_and_lags) const;
@ -1319,8 +1320,8 @@ public:
virtual expr_t removeTrendLeadLag(map<int, expr_t> trend_symbols_map) const; virtual expr_t removeTrendLeadLag(map<int, expr_t> trend_symbols_map) const;
virtual bool isInStaticForm() const; virtual bool isInStaticForm() const;
virtual void setVarExpectationIndex(map<string, pair<SymbolList, int> > &var_model_info); virtual void setVarExpectationIndex(map<string, pair<SymbolList, int> > &var_model_info);
virtual void walkPacParameters(bool &pac_encountered, pair<int, int> &lhs, set<pair<int, pair<int, int> > > &params_and_vals) const; virtual void walkPacParameters(bool &pac_encountered, pair<int, int> &lhs, set<pair<int, pair<int, int> > > &ec_params_and_vars, set<pair<int, pair<int, int> > > &params_and_vars) const;
virtual void addParamInfoToPac(pair<int, int> &lhs_arg, set<pair<int, pair<int, int> > > &params_and_vals_arg); virtual void addParamInfoToPac(pair<int, int> &lhs_arg, set<pair<int, pair<int, int> > > &ec_params_and_vars_arg, set<pair<int, pair<int, int> > > &params_and_vars_arg);
virtual void fillPacExpectationVarInfo(string &model_name_arg, vector<int> &lhs_arg, int max_lag_arg, vector<bool> &nonstationary_arg, int growth_symb_id_arg, int equation_number_arg); virtual void fillPacExpectationVarInfo(string &model_name_arg, vector<int> &lhs_arg, int max_lag_arg, vector<bool> &nonstationary_arg, int growth_symb_id_arg, int equation_number_arg);
virtual bool isVarModelReferenced(const string &model_info_name) const; virtual bool isVarModelReferenced(const string &model_info_name) const;
virtual void getEndosAndMaxLags(map<string, int> &model_endos_and_lags) const; virtual void getEndosAndMaxLags(map<string, int> &model_endos_and_lags) const;
@ -1340,7 +1341,8 @@ private:
int max_lag; int max_lag;
vector<int> h0_indices, h1_indices; vector<int> h0_indices, h1_indices;
int growth_param_index, equation_number; int growth_param_index, equation_number;
set<pair<int, pair<int, int> > > params_and_vals; set<pair<int, pair<int, int> > > ec_params_and_vars;
set<pair<int, pair<int, int> > > ar_params_and_vars;
public: public:
PacExpectationNode(DataTree &datatree_arg, const string &model_name); PacExpectationNode(DataTree &datatree_arg, const string &model_name);
virtual void computeTemporaryTerms(map<expr_t, pair<int, NodeTreeReference> > &reference_count, virtual void computeTemporaryTerms(map<expr_t, pair<int, NodeTreeReference> > &reference_count,
@ -1400,8 +1402,8 @@ public:
virtual expr_t removeTrendLeadLag(map<int, expr_t> trend_symbols_map) const; virtual expr_t removeTrendLeadLag(map<int, expr_t> trend_symbols_map) const;
virtual bool isInStaticForm() const; virtual bool isInStaticForm() const;
virtual void setVarExpectationIndex(map<string, pair<SymbolList, int> > &var_model_info); virtual void setVarExpectationIndex(map<string, pair<SymbolList, int> > &var_model_info);
virtual void walkPacParameters(bool &pac_encountered, pair<int, int> &lhs, set<pair<int, pair<int, int> > > &params_and_vals) const; virtual void walkPacParameters(bool &pac_encountered, pair<int, int> &lhs, set<pair<int, pair<int, int> > > &ec_params_and_vars, set<pair<int, pair<int, int> > > &params_and_vars) const;
virtual void addParamInfoToPac(pair<int, int> &lhs_arg, set<pair<int, pair<int, int> > > &params_and_vals_arg); virtual void addParamInfoToPac(pair<int, int> &lhs_arg, set<pair<int, pair<int, int> > > &ec_params_and_vars_arg, set<pair<int, pair<int, int> > > &params_and_vars_arg);
virtual void fillPacExpectationVarInfo(string &model_name_arg, vector<int> &lhs_arg, int max_lag_arg, vector<bool> &nonstationary_arg, int growth_symb_id_arg, int equation_number_arg); virtual void fillPacExpectationVarInfo(string &model_name_arg, vector<int> &lhs_arg, int max_lag_arg, vector<bool> &nonstationary_arg, int growth_symb_id_arg, int equation_number_arg);
virtual bool isVarModelReferenced(const string &model_info_name) const; virtual bool isVarModelReferenced(const string &model_info_name) const;
virtual void getEndosAndMaxLags(map<string, int> &model_endos_and_lags) const; virtual void getEndosAndMaxLags(map<string, int> &model_endos_and_lags) const;