clean up printing
parent
34e649afc7
commit
4a4a4c1d54
|
@ -2554,14 +2554,14 @@ DynamicModel::writeOutput(ostream &output, const string &basename, bool block_de
|
||||||
// Write equation tags
|
// Write equation tags
|
||||||
if (julia)
|
if (julia)
|
||||||
{
|
{
|
||||||
output << modstruct << "equations_tags = [" << endl;
|
output << modstruct << "equation_tags = [" << endl;
|
||||||
for (size_t i = 0; i < equation_tags.size(); i++)
|
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.first << "\" , \""
|
||||||
<< equation_tags[i].second.second << "\")" << endl;
|
<< equation_tags[i].second.second << "\")" << endl;
|
||||||
output << "]" << endl;
|
output << " ]" << endl;
|
||||||
}
|
}
|
||||||
|
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
output << modstruct << "equations_tags = {" << endl;
|
output << modstruct << "equations_tags = {" << endl;
|
||||||
|
|
|
@ -1483,7 +1483,7 @@ StaticModel::writeStaticModel(ostream &StaticOutput, bool use_dll, bool julia) c
|
||||||
<< model_output.str()
|
<< model_output.str()
|
||||||
<< " #" << endl
|
<< " #" << endl
|
||||||
<< " # Jacobian matrix" << endl
|
<< " # Jacobian matrix" << endl
|
||||||
<< " #" << endl << endl
|
<< " #" << endl
|
||||||
<< jacobian_output.str()
|
<< jacobian_output.str()
|
||||||
<< " if ~isreal(g1)" << endl
|
<< " if ~isreal(g1)" << endl
|
||||||
<< " g1 = real(g1)+2*imag(g1);" << endl
|
<< " g1 = real(g1)+2*imag(g1);" << endl
|
||||||
|
|
|
@ -724,24 +724,24 @@ SymbolTable::writeJuliaOutput(ostream &output) const throw (NotYetFrozenExceptio
|
||||||
throw NotYetFrozenException();
|
throw NotYetFrozenException();
|
||||||
|
|
||||||
output << "# Endogenous Variables" << endl
|
output << "# Endogenous Variables" << endl
|
||||||
<< "model.endo = [" << endl;
|
<< "model.endo = [" << endl;
|
||||||
if (endo_nbr() > 0)
|
if (endo_nbr() > 0)
|
||||||
for (int id = 0; id < endo_nbr(); id++)
|
for (int id = 0; id < endo_nbr(); id++)
|
||||||
output << " DynareModel.Endo(\""
|
output << " DynareModel.Endo(\""
|
||||||
<< getName(endo_ids[id]) << "\", \""
|
<< getName(endo_ids[id]) << "\", \""
|
||||||
<< getTeXName(endo_ids[id]) << "\", \""
|
<< getTeXName(endo_ids[id]) << "\", \""
|
||||||
<< getLongName(endo_ids[id]) << "\")" << endl;
|
<< getLongName(endo_ids[id]) << "\")" << endl;
|
||||||
output << " ]" << endl;
|
output << " ]" << endl;
|
||||||
|
|
||||||
output << "# Exogenous Variables" << endl
|
output << "# Exogenous Variables" << endl
|
||||||
<< "model.exo = [" << endl;
|
<< "model.exo = [" << endl;
|
||||||
if (exo_nbr() > 0)
|
if (exo_nbr() > 0)
|
||||||
for (int id = 0; id < exo_nbr(); id++)
|
for (int id = 0; id < exo_nbr(); id++)
|
||||||
output << " DynareModel.Exo(\""
|
output << " DynareModel.Exo(\""
|
||||||
<< getName(exo_ids[id]) << "\", \""
|
<< getName(exo_ids[id]) << "\", \""
|
||||||
<< getTeXName(exo_ids[id]) << "\", \""
|
<< getTeXName(exo_ids[id]) << "\", \""
|
||||||
<< getLongName(exo_ids[id]) << "\")" << endl;
|
<< getLongName(exo_ids[id]) << "\")" << endl;
|
||||||
output << " ]" << endl;
|
output << " ]" << endl;
|
||||||
|
|
||||||
if (exo_det_nbr() > 0)
|
if (exo_det_nbr() > 0)
|
||||||
{
|
{
|
||||||
|
@ -757,14 +757,14 @@ SymbolTable::writeJuliaOutput(ostream &output) const throw (NotYetFrozenExceptio
|
||||||
}
|
}
|
||||||
|
|
||||||
output << "# Parameters" << endl
|
output << "# Parameters" << endl
|
||||||
<< "model.param = [" << endl;
|
<< "model.param = [" << endl;
|
||||||
if (param_nbr() > 0)
|
if (param_nbr() > 0)
|
||||||
for (int id = 0; id < param_nbr(); id++)
|
for (int id = 0; id < param_nbr(); id++)
|
||||||
output << " DynareModel.Param(\""
|
output << " DynareModel.Param(\""
|
||||||
<< getName(param_ids[id]) << "\", \""
|
<< getName(param_ids[id]) << "\", \""
|
||||||
<< getTeXName(param_ids[id]) << "\", \""
|
<< getTeXName(param_ids[id]) << "\", \""
|
||||||
<< getLongName(param_ids[id]) << "\")" << endl;
|
<< getLongName(param_ids[id]) << "\")" << endl;
|
||||||
output << " ]" << endl;
|
output << " ]" << endl;
|
||||||
|
|
||||||
output << "model.orig_endo_nbr = " << orig_endo_nbr() << endl;
|
output << "model.orig_endo_nbr = " << orig_endo_nbr() << endl;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue