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

preprocessor: JSON output aesthetic fixes, support planner objective. #1387

issue#70
Houtan Bastani 2017-02-27 15:40:34 +01:00
parent 236f1ca7d0
commit 301c9691d9
8 changed files with 43 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ComputingTasks.cc
View File

@ -668,9 +668,8 @@ RamseyPolicyStatement::writeJsonOutput(ostream &output) const
{
output << ", ";
options_list.writeJsonOutput(output);
output << ", ";
}
output << "\"ramsey_policy_list\": [";
output << ", \"ramsey_policy_list\": [";
for (vector<string>::const_iterator it = ramsey_policy_list.begin();
it != ramsey_policy_list.end(); ++it)
{
@ -1827,7 +1826,8 @@ ModelComparisonStatement::writeJsonOutput(ostream &output) const
}
PlannerObjectiveStatement::PlannerObjectiveStatement(StaticModel *model_tree_arg) :
model_tree(model_tree_arg)
model_tree(model_tree_arg),
computing_pass_called(false)
{
}
@ -1860,6 +1860,7 @@ void
PlannerObjectiveStatement::computingPass()
{
model_tree->computingPass(eval_context_t(), false, true, true, none, false, false);
computing_pass_called = true;
}
void
@ -1871,9 +1872,14 @@ PlannerObjectiveStatement::writeOutput(ostream &output, const string &basename,
void
PlannerObjectiveStatement::writeJsonOutput(ostream &output) const
{
cerr << "ERROR: writeJsonOutput not yet implemented for Planner Objective Statement" << endl;
exit(EXIT_FAILURE);
// model_tree->writeStaticJsonFile(basename + "_objective", false, false, false, false);
output << "{\"statementName\": \"planner_objective\""
<< ", ";
if (computing_pass_called)
model_tree->writeJsonComputingPassOutput(output);
else
model_tree->writeJsonOutput(output);
output << "}";
}
BVARDensityStatement::BVARDensityStatement(int maxnlags_arg, const OptionsList &options_list_arg) :

1
ComputingTasks.hh
View File

@ -449,6 +449,7 @@ class PlannerObjectiveStatement : public Statement
{
private:
StaticModel *model_tree;
bool computing_pass_called;
public:
//! Constructor
/*! \param model_tree_arg the model tree used to store the objective function.

2
DynamicModel.cc
View File

@ -5364,7 +5364,7 @@ DynamicModel::writeJsonComputingPassOutput(ostream &output) const
writeJsonModelLocalVariables(model_local_vars_output, tef_terms);
writeJsonTemporaryTerms(temporary_terms_res, temp_term_union_m_1, model_output, tef_terms, concat);
model_output << ", ";
writeJsonModelEquations(model_output, true);
// Writing Jacobian

4
ModFile.cc
View File

@ -1291,11 +1291,12 @@ ModFile::writeJsonOutputParsingCheck(const string &basename, JsonFileOutputType
output << "{" << endl;
symbol_table.writeJsonOutput(output);
output << ", ";
dynamic_model.writeJsonOutput(output);
if (!statements.empty())
{
output << ",\"statements\": [";
output << ", \"statements\": [";
for (vector<Statement *>::const_iterator it = statements.begin();
it != statements.end(); it++)
{
@ -1305,7 +1306,6 @@ ModFile::writeJsonOutputParsingCheck(const string &basename, JsonFileOutputType
}
output << "]" << endl;
}
output << "}" << endl;
if (json_output_mode == standardout)

4
ModelTree.cc
View File

@ -2028,9 +2028,9 @@ ModelTree::writeJsonModelEquations(ostream &output, bool residuals) const
vector<pair<string,string> > eqtags;
temporary_terms_t tt_empty;
if (residuals)
output << endl << ",\"residuals\":[" << endl;
output << endl << "\"residuals\":[" << endl;
else
output << endl << ",\"model\":[" << endl;
output << endl << "\"model\":[" << endl;
for (int eq = 0; eq < (int) equations.size(); eq++)
{
if (eq > 0)

8
StaticModel.cc
View File

@ -2415,6 +2415,12 @@ StaticModel::writeParamsDerivativesFile(const string &basename, bool julia) cons
paramsDerivsFile.close();
}
void
StaticModel::writeJsonOutput(ostream &output) const
{
writeJsonModelEquations(output, false);
}
void
StaticModel::writeJsonComputingPassOutput(ostream &output) const
{
@ -2434,7 +2440,7 @@ StaticModel::writeJsonComputingPassOutput(ostream &output) const
writeJsonModelLocalVariables(model_local_vars_output, tef_terms);
writeJsonTemporaryTerms(temporary_terms_res, temp_term_union_m_1, model_output, tef_terms, concat);
model_output << ", ";
writeJsonModelEquations(model_output, true);
int nrows = equations.size();

3
StaticModel.hh
View File

@ -173,6 +173,9 @@ public:
//! Writes static model file
void writeStaticFile(const string &basename, bool block, bool bytecode, bool use_dll, bool julia) const;
//! Write JSON Output (used by PlannerObjectiveStatement)
void writeJsonOutput(ostream &output) const;
//! Write JSON representation of static model
void writeJsonComputingPassOutput(ostream &output) const;

68
SymbolTable.cc
View File

@ -965,57 +965,18 @@ SymbolTable::writeJuliaOutput(ostream &output) const throw (NotYetFrozenExceptio
void
SymbolTable::writeJsonOutput(ostream &output) const
{/*
vector<int> endos, exos, exo_dets, params;
for (int i = 0; i < size; i++)
{
switch (getType(i))
{
case eEndogenous:
endos.push_back(i);
break;
case eExogenous:
exos.push_back(i);
break;
case eExogenousDet:
exo_dets.push_back(i);
break;
case eParameter:
params.push_back(i);
break;
default:
break;
}
}
*/
{
output << "\"endogenous\": ";
writeJsonVarVector(output, endo_ids);
if (!endo_ids.empty())
{
output << "\"endogenous\":";
writeJsonVarVector(output, endo_ids);
output << endl;
}
output << ", \"exogenous\":" ;
writeJsonVarVector(output, exo_ids);
if (!exo_ids.empty())
{
output << ",\"exogenous\":";
writeJsonVarVector(output, exo_ids);
output << endl;
}
output << ", \"exogenous_deterministic\": ";
writeJsonVarVector(output, exo_det_ids);
if (!exo_det_ids.empty())
{
output << ",\"exogenous_deterministic\":";
writeJsonVarVector(output, exo_det_ids);
output << endl;
}
if (!param_ids.empty())
{
output << ",\"parameters\":";
writeJsonVarVector(output, param_ids);
cout << endl;
}
output << ", \"parameters\": ";
writeJsonVarVector(output, param_ids);
}
void
@ -1024,12 +985,13 @@ SymbolTable::writeJsonVarVector(ostream &output, const vector<int> &varvec) cons
output << "[";
for (size_t i = 0; i < varvec.size(); i++)
{
output << endl << "{"
if (i != 0)
output << ", ";
output << "{"
<< "\"name\":\"" << getName(varvec[i]) << "\", "
<< "\"texName\":\"" << boost::replace_all_copy(getTeXName(varvec[i]), "\\", "\\\\") << "\", "
<< "\"longName\":\"" << boost::replace_all_copy(getLongName(varvec[i]), "\\", "\\\\") << "\"}";
if (i < varvec.size() - 1)
output << ", ";
<< "\"longName\":\"" << boost::replace_all_copy(getLongName(varvec[i]), "\\", "\\\\") << "\"}"
<< endl;
}
output << endl << "]";
output << "]" << endl;
}