From cb0b8c9ba3160e6628b1e2454ebabe1771d2e6de Mon Sep 17 00:00:00 2001 From: Houtan Bastani Date: Thu, 20 Aug 2015 12:27:43 +0200 Subject: [PATCH] update comments in static & dynamic funcitons --- DynamicModel.cc | 28 ++++++++++++++-------------- StaticModel.cc | 31 +++++++++++++++++-------------- 2 files changed, 31 insertions(+), 28 deletions(-) diff --git a/DynamicModel.cc b/DynamicModel.cc index 06f6ae07..d12c13e0 100644 --- a/DynamicModel.cc +++ b/DynamicModel.cc @@ -2354,8 +2354,8 @@ DynamicModel::writeDynamicModel(ostream &DynamicOutput, bool use_dll, bool julia << " steady_state::Vector{Float64}, it_::Int, " << "residual::Vector{Float64})" << endl << "#" << endl - << "# Output" << endl - << "# residual: " << nrows << " x 1" << endl + << "# Expected inputs of Outputs:" << endl + << "# residual: Array(Float64, " << nrows << ", 1)" << endl << "#" << endl << "fill!(residual, 0.0)" << endl << endl << "#" << endl @@ -2370,9 +2370,9 @@ DynamicModel::writeDynamicModel(ostream &DynamicOutput, bool use_dll, bool julia << "residual::Vector{Float64}," << endl << " g1::Matrix{Float64})" << endl << " #" << endl - << " # Output" << endl - << " # residual: " << nrows << " x 1" << endl - << " # g1: " << nrows << " x " << dynJacobianColsNbr << endl + << " # Expected inputs of Outputs:" << endl + << " # residual: Array(Float64, " << nrows << ", 1)" << endl + << " # g1: Array(Float64, " << nrows << ", " << dynJacobianColsNbr << ")" << endl << " #" << endl << " fill!(g1, 0.0)" << endl << endl << " dynamic!(y, x, params, steady_state, it_, residual)" << endl @@ -2388,10 +2388,10 @@ DynamicModel::writeDynamicModel(ostream &DynamicOutput, bool use_dll, bool julia << "residual::Vector{Float64}," << endl << " g1::Matrix{Float64}, g2::Matrix{Float64})" << endl << " #" << endl - << " # Output" << endl - << " # residual: " << nrows << " x 1" << endl - << " # g1: " << nrows << " x " << dynJacobianColsNbr << endl - << " # g2: sparse zeros " << nrows << " x " << hessianColsNbr << endl + << " # Expected inputs of Outputs:" << endl + << " # residual: Array(Float64, " << nrows << ", 1)" << endl + << " # g1: Array(Float64, " << nrows << ", " << dynJacobianColsNbr << ")" << endl + << " # g2: spzeros(" << nrows << ", " << hessianColsNbr << ")" << endl << " #" << endl << endl << " dynamic!(y, x, params, steady_state, it_, residual, g1)" << endl << model_output.str() @@ -2410,11 +2410,11 @@ DynamicModel::writeDynamicModel(ostream &DynamicOutput, bool use_dll, bool julia << "residual::Vector{Float64}," << endl << " g1::Matrix{Float64}, g2::Matrix{Float64}, g3::Matrix{Float64})" << endl << " #" << endl - << " # Output" << endl - << " # residual: " << nrows << " x 1" << endl - << " # g1: " << nrows << " x " << dynJacobianColsNbr << endl - << " # g2: sparse zeros " << nrows << " x " << hessianColsNbr << endl - << " # g3: sparse zeros " << nrows << " x " << ncols << endl + << " # Expected inputs of Outputs:" << endl + << " # residual: Array(Float64, " << nrows << ", 1)" << endl + << " # g1: Array(Float64, " << nrows << ", " << dynJacobianColsNbr << ")" << endl + << " # g2: spzeros(" << nrows << ", " << hessianColsNbr << ")" << endl + << " # g3: spzeros(" << nrows << ", " << ncols << ")" << endl << " #" << endl << endl << " dynamic!(y, x, params, steady_state, it_, residual, g1, g2)" << endl << " #" << endl diff --git a/StaticModel.cc b/StaticModel.cc index d6253a93..5646279b 100644 --- a/StaticModel.cc +++ b/StaticModel.cc @@ -1425,8 +1425,8 @@ StaticModel::writeStaticModel(ostream &StaticOutput, bool use_dll, bool julia) c << "params::Vector{Float64}," << endl << " residual::Vector{Float64})" << endl << "#" << endl - << "# Output" << endl - << "# residual: " << equations.size() << " x 1" << endl + << "# Expected inputs of Outputs:" << endl + << "# residual: Array(Float64, " << equations.size() << ", 1)" << endl << "#" << endl << "fill!(residual, 0.0)" << endl << endl << "#" << endl @@ -1442,9 +1442,10 @@ StaticModel::writeStaticModel(ostream &StaticOutput, bool use_dll, bool julia) c << "params::Vector{Float64}," << endl << " residual::Vector{Float64}, g1::Matrix{Float64})" << endl << " #" << endl - << " # Output" << endl - << " # residual: " << equations.size() << " x 1" << endl - << " # g1: " << equations.size() << " x " << symbol_table.endo_nbr() << endl + << " # Expected inputs of Outputs:" << endl + << " # residual: Array(Float64, " << equations.size() << ", 1)" << endl + << " # g1: Array(Float64, " << equations.size() << ", " + << symbol_table.endo_nbr() << ")" << endl << " #" << endl << " fill!(g1, 0.0)" << endl << endl << " static!(y, x, params, residual)" << endl @@ -1462,10 +1463,11 @@ StaticModel::writeStaticModel(ostream &StaticOutput, bool use_dll, bool julia) c << " residual::Vector{Float64}, g1::Matrix{Float64}, " << "g2::Matrix{Float64})" << endl << " #" << endl - << " # Output" << endl - << " # residual: " << equations.size() << " x 1" << endl - << " # g1: " << equations.size() << " x " << symbol_table.endo_nbr() << endl - << " # g2: sparse zeros " << equations.size() << " x " << g2ncols << endl + << " # Expected inputs of Outputs:" << endl + << " # residual: Array(Float64, " << equations.size() << ", 1)" << endl + << " # g1: Array(Float64, " << equations.size() << ", " + << symbol_table.endo_nbr() << ")" << endl + << " # g2: spzeros(" << equations.size() << ", " << g2ncols << ")" << endl << " #" << endl << endl << " static!(y, x, params, residual, g1)" << endl << model_output.str() @@ -1485,11 +1487,12 @@ StaticModel::writeStaticModel(ostream &StaticOutput, bool use_dll, bool julia) c << "g2::Matrix{Float64}," << endl << " g3::Matrix{Float64})" << endl << " #" << endl - << " # Output" << endl - << " # residual: " << equations.size() << " x 1" << endl - << " # g1: " << equations.size() << " x " << symbol_table.endo_nbr() << endl - << " # g2: sparse zeros " << equations.size() << " x " << g2ncols << endl - << " # g3: sparse zeros " << nrows << " x " << ncols << endl + << " # Expected inputs of Outputs:" << endl + << " # residual: Array(Float64, " << equations.size() << ", 1)" << endl + << " # g1: Array(Float64, " << equations.size() << ", " + << symbol_table.endo_nbr() << ")" << endl + << " # g2: spzeros(" << equations.size() << ", " << g2ncols << ")" << endl + << " # g3: spzeros(" << nrows << ", " << ncols << ")" << endl << " #" << endl << endl << " static!(y, x, params, residual, g1, g2)" << endl << " #" << endl