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

update comments in static & dynamic funcitons

issue#70
Houtan Bastani 2015-08-20 12:27:43 +02:00
parent 046bc44e8a
commit cb0b8c9ba3
2 changed files with 31 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
DynamicModel.cc
View File

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

31
StaticModel.cc
View File

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