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

clean up printing

time-shift
Houtan Bastani 2015-08-21 16:28:43 +02:00
parent 5666e12e8f
commit 2a9761ff33
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
julia/DynareModel.jl
View File

@ -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)

8
preprocessor/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
preprocessor/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