clean up printing
parent
5666e12e8f
commit
2a9761ff33
|
@ -110,7 +110,7 @@ type Model
|
|||
lead_lag_incidence::Matrix{Int}
|
||||
nnzderivatives::Vector{Int}
|
||||
static_and_dynamic_models_differ::Bool
|
||||
equations_tags::Vector{UTF8String}
|
||||
equation_tags::Vector{UTF8String}
|
||||
exo_names_orig_ord::Vector{Int}
|
||||
sigma_e::Matrix{Float64}
|
||||
correlation_matrix::Matrix{Float64}
|
||||
|
@ -157,7 +157,7 @@ function dynare_model()
|
|||
Array(Int, 3, 0), # lead_lag_incidence
|
||||
zeros(Int, 3), # nnzderivatives
|
||||
false, # static_and_dynamic_models_differ
|
||||
Array(ASCIIString,0), # equations_tags
|
||||
Array(ASCIIString,0), # equation_tags
|
||||
Array(Int64,1), # exo_names_orig_ord
|
||||
Array(Float64, 0, 0), # sigma_e (Cov matrix of the structural innovations)
|
||||
Array(Float64, 0, 0), # correlation_matrix (Corr matrix of the structural innovations)
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
Loading…
Reference in New Issue