diff --git a/julia/DynareModel.jl b/julia/DynareModel.jl index cba72b03625d4a82928c13bed672c444e0cdb5bb..a85442c9d2bfe3741f7237d03720492e3b61077f 100644 --- a/julia/DynareModel.jl +++ b/julia/DynareModel.jl @@ -119,7 +119,7 @@ type Model h::Matrix{Float64} correlation_matrix_me::Matrix{Float64} sigma_e_is_diagonal::Bool - params::Matrix{Float64} + params::Vector{Float64} static::Function static_params_derivs::Function dynamic::Function @@ -168,7 +168,7 @@ function dynare_model() Array(Float64, 0, 0), # h (Cov matrix of the measurement errors) Array(Float64, 0, 0), # correlation_matrix_me (Cov matrix of the measurement errors) true, # sigma_e_is_diagonal - Array(Float64, 0, 0), # params + Array(Float64, 0), # params function()end, # static function()end, # static_params_derivs function()end, # dynamic diff --git a/julia/DynareOutput.jl b/julia/DynareOutput.jl index f8aea529d75139ab8147a88c7838c618e99dbcde..81a4132f75017db245368b5fe00bc8904727f468 100644 --- a/julia/DynareOutput.jl +++ b/julia/DynareOutput.jl @@ -23,14 +23,14 @@ export dynare_output type Output dynare_version::ASCIIString - steady_state::Matrix{Float64} - exo_steady_state::Matrix{Float64} + steady_state::Vector{Float64} + exo_steady_state::Vector{Float64} end function dynare_output() return Output("", # dynare_version - Array(Float64, 0, 0), # steady_state - Array(Float64, 0, 0) # exo_steady_state + Array(Float64, 0), # steady_state + Array(Float64, 0) # exo_steady_state ) end diff --git a/preprocessor/DynamicModel.cc b/preprocessor/DynamicModel.cc index ba3140adffec7dbc8e30f8f3e37be2942019cf91..ccebb9ec97ff7d50fedf0102135b5d14213115d3 100644 --- a/preprocessor/DynamicModel.cc +++ b/preprocessor/DynamicModel.cc @@ -3052,21 +3052,21 @@ DynamicModel::writeOutput(ostream &output, const string &basename, bool block_de output << modstruct << "maximum_endo_lag = " << max_endo_lag << ";" << endl << modstruct << "maximum_endo_lead = " << max_endo_lead << ";" << endl - << outstruct << "steady_state = zeros(" << symbol_table.endo_nbr() << ", 1);" << endl; + << outstruct << "steady_state = zeros(" << symbol_table.endo_nbr() << (julia ? ")" : ", 1);" ) << endl; output << modstruct << "maximum_exo_lag = " << max_exo_lag << ";" << endl << modstruct << "maximum_exo_lead = " << max_exo_lead << ";" << endl - << outstruct << "exo_steady_state = zeros(" << symbol_table.exo_nbr() << ", 1);" << endl; + << outstruct << "exo_steady_state = zeros(" << symbol_table.exo_nbr() << (julia ? ")" : ", 1);" ) << endl; if (symbol_table.exo_det_nbr()) { output << modstruct << "maximum_exo_det_lag = " << max_exo_det_lag << ";" << endl << modstruct << "maximum_exo_det_lead = " << max_exo_det_lead << ";" << endl - << outstruct << "exo_det_steady_state = zeros(" << symbol_table.exo_det_nbr() << ", 1);" << endl; + << outstruct << "exo_det_steady_state = zeros(" << symbol_table.exo_det_nbr() << (julia ? ")" : ", 1);" ) << endl; } output << modstruct << "params = " << (julia ? "fill(NaN, " : "NaN(") - << symbol_table.param_nbr() << ", 1);" << endl; + << symbol_table.param_nbr() << (julia ? ")" : ", 1);" ) << endl; if (compute_xrefs) writeXrefs(output);