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

clean up printing

issue#70
Houtan Bastani 2015-08-21 16:28:43 +02:00
parent 34e649afc7
commit 4a4a4c1d54
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
DynamicModel.cc
View File

@ -2554,14 +2554,14 @@ DynamicModel::writeOutput(ostream &output, const string &basename, bool block_de
// Write equation tags
if (julia)
{
output << modstruct << "equations_tags = [" << endl;
output << modstruct << "equation_tags = [" << endl;
for (size_t i = 0; i < equation_tags.size(); i++)
output << " EquationTag(" << equation_tags[i].first + 1 << " , \""
output << " EquationTag("
<< equation_tags[i].first + 1 << " , \""
<< equation_tags[i].second.first << "\" , \""
<< equation_tags[i].second.second << "\")" << endl;
output << "]" << endl;
output << " ]" << endl;
}
else
{
output << modstruct << "equations_tags = {" << endl;

2
StaticModel.cc
View File

@ -1483,7 +1483,7 @@ StaticModel::writeStaticModel(ostream &StaticOutput, bool use_dll, bool julia) c
<< model_output.str()
<< " #" << endl
<< " # Jacobian matrix" << endl
<< " #" << endl << endl
<< " #" << endl
<< jacobian_output.str()
<< " if ~isreal(g1)" << endl
<< " g1 = real(g1)+2*imag(g1);" << endl

18
SymbolTable.cc
View File

@ -724,24 +724,24 @@ SymbolTable::writeJuliaOutput(ostream &output) const throw (NotYetFrozenExceptio
throw NotYetFrozenException();
output << "# Endogenous Variables" << endl
<< "model.endo = [" << endl;
<< "model.endo = [" << endl;
if (endo_nbr() > 0)
for (int id = 0; id < endo_nbr(); id++)
output << " DynareModel.Endo(\""
output << " DynareModel.Endo(\""
<< getName(endo_ids[id]) << "\", \""
<< getTeXName(endo_ids[id]) << "\", \""
<< getLongName(endo_ids[id]) << "\")" << endl;
output << " ]" << endl;
output << " ]" << endl;
output << "# Exogenous Variables" << endl
<< "model.exo = [" << endl;
<< "model.exo = [" << endl;
if (exo_nbr() > 0)
for (int id = 0; id < exo_nbr(); id++)
output << " DynareModel.Exo(\""
output << " DynareModel.Exo(\""
<< getName(exo_ids[id]) << "\", \""
<< getTeXName(exo_ids[id]) << "\", \""
<< getLongName(exo_ids[id]) << "\")" << endl;
output << " ]" << endl;
output << " ]" << endl;
if (exo_det_nbr() > 0)
{
@ -757,14 +757,14 @@ SymbolTable::writeJuliaOutput(ostream &output) const throw (NotYetFrozenExceptio
}
output << "# Parameters" << endl
<< "model.param = [" << endl;
<< "model.param = [" << endl;
if (param_nbr() > 0)
for (int id = 0; id < param_nbr(); id++)
output << " DynareModel.Param(\""
output << " DynareModel.Param(\""
<< getName(param_ids[id]) << "\", \""
<< getTeXName(param_ids[id]) << "\", \""
<< getLongName(param_ids[id]) << "\")" << endl;
output << " ]" << endl;
output << " ]" << endl;
output << "model.orig_endo_nbr = " << orig_endo_nbr() << endl;