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

update static & dynamic function comments

issue#70
Houtan Bastani 2015-08-20 15:28:32 +02:00
parent 5789d1f33b
commit c1d3b521ed
2 changed files with 28 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
DynamicModel.cc
View File

@ -2370,8 +2370,8 @@ DynamicModel::writeDynamicModel(ostream &DynamicOutput, bool use_dll, bool julia
<< " steady_state::Vector{Float64}, it_::Int, "
<< "residual::Vector{Float64})" << endl
<< "#" << endl
<< "# Expected inputs of Outputs:" << endl
<< "# residual: Array(Float64, " << nrows << ", 1)" << endl
<< "# Function argument sizes:" << endl
<< "# residual: Array(Float64, model.eq_nbr, 1)" << endl
<< "#" << endl
<< "@assert size(residual) == " << nrows << endl
<< "fill!(residual, 0.0)" << endl << endl
@ -2387,9 +2387,9 @@ DynamicModel::writeDynamicModel(ostream &DynamicOutput, bool use_dll, bool julia
<< "residual::Vector{Float64}," << endl
<< " g1::Matrix{Float64})" << endl
<< " #" << endl
<< " # Expected inputs of Outputs:" << endl
<< " # residual: Array(Float64, " << nrows << ", 1)" << endl
<< " # g1: Array(Float64, " << nrows << ", " << dynJacobianColsNbr << ")" << endl
<< " # Function argument sizes:" << endl
<< " # residual: Array(Float64, model.eq_nbr, 1)" << endl
<< " # g1: Array(Float64, model.eq_nbr, num_dynamic_endo_(+exo?)_vars)" << endl
<< " #" << endl
<< " @assert size(g1) == (" << nrows << ", " << dynJacobianColsNbr << ")" << endl
<< " fill!(g1, 0.0)" << endl << endl
@ -2406,10 +2406,10 @@ DynamicModel::writeDynamicModel(ostream &DynamicOutput, bool use_dll, bool julia
<< "residual::Vector{Float64}," << endl
<< " g1::Matrix{Float64}, g2::Matrix{Float64})" << endl
<< " #" << endl
<< " # Expected inputs of Outputs:" << endl
<< " # residual: Array(Float64, " << nrows << ", 1)" << endl
<< " # g1: Array(Float64, " << nrows << ", " << dynJacobianColsNbr << ")" << endl
<< " # g2: spzeros(" << nrows << ", " << hessianColsNbr << ")" << endl
<< " # Function argument sizes:" << endl
<< " # residual: Array(Float64, model.eq_nbr, 1)" << endl
<< " # g1: Array(Float64, model.eq_nbr, num_dynamic_endo_(+exo?)_vars)" << endl
<< " # g2: spzeros(model.eq_nbr, (num_dynamic_endo_(+exo?)_vars)^2)" << endl
<< " #" << endl << endl
<< " @assert size(g2) == (" << nrows << ", " << hessianColsNbr << ")" << endl
<< " dynamic!(y, x, params, steady_state, it_, residual, g1)" << endl;
@ -2429,11 +2429,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
<< " # 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
<< " # Function argument sizes:" << endl
<< " # residual: Array(Float64, model.eq_nbr, 1)" << endl
<< " # g1: Array(Float64, model.eq_nbr, num_dynamic_endo_(+exo?)_vars)" << endl
<< " # g2: spzeros(model.eq_nbr, (num_dynamic_endo_(+exo?)_vars)^2)" << endl
<< " # g3: spzeros(model.eq_nbr, (num_dynamic_endo_(+exo?)_vars)^3)" << endl
<< " #" << endl << endl
<< " @assert size(g3) == (" << nrows << ", " << ncols << ")" << endl
<< " dynamic!(y, x, params, steady_state, it_, residual, g1, g2)" << endl;

31
StaticModel.cc
View File

@ -1440,8 +1440,8 @@ StaticModel::writeStaticModel(ostream &StaticOutput, bool use_dll, bool julia) c
<< "params::Vector{Float64}," << endl
<< " residual::Vector{Float64})" << endl
<< "#" << endl
<< "# Expected inputs of Outputs:" << endl
<< "# residual: Array(Float64, " << equations.size() << ", 1)" << endl
<< "# Function argument sizes:" << endl
<< "# residual: Array(Float64, model.eq_nbr, 1)" << endl
<< "#" << endl
<< "@assert size(residual) == " << equations.size() << endl
<< "fill!(residual, 0.0)" << endl << endl
@ -1458,10 +1458,9 @@ StaticModel::writeStaticModel(ostream &StaticOutput, bool use_dll, bool julia) c
<< "params::Vector{Float64}," << endl
<< " residual::Vector{Float64}, g1::Matrix{Float64})" << endl
<< " #" << endl
<< " # Expected inputs of Outputs:" << endl
<< " # residual: Array(Float64, " << equations.size() << ", 1)" << endl
<< " # g1: Array(Float64, " << equations.size() << ", "
<< symbol_table.endo_nbr() << ")" << endl
<< " # Function argument sizes:" << endl
<< " # residual: Array(Float64, model.eq_nbr, 1)" << endl
<< " # g1: Array(Float64, model.eq_nbr, length(model.endo))" << endl
<< " #" << endl
<< " @assert size(g1) == (" << equations.size() << ", " << symbol_table.endo_nbr()
<< ")" << endl
@ -1481,11 +1480,10 @@ StaticModel::writeStaticModel(ostream &StaticOutput, bool use_dll, bool julia) c
<< " residual::Vector{Float64}, g1::Matrix{Float64}, "
<< "g2::Matrix{Float64})" << endl
<< " #" << 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
<< " # Function argument sizes:" << endl
<< " # residual: Array(Float64, model.eq_nbr, 1)" << endl
<< " # g1: Array(Float64, model.eq_nbr, length(model.endo))" << endl
<< " # g2: spzeros(model.eq_nbr, length(model.endo)^2)" << endl
<< " #" << endl << endl
<< " @assert size(g2) == (" << equations.size() << ", " << g2ncols << ")" << endl
<< " static!(y, x, params, residual, g1)" << endl;
@ -1505,12 +1503,11 @@ StaticModel::writeStaticModel(ostream &StaticOutput, bool use_dll, bool julia) c
<< "g2::Matrix{Float64}," << endl
<< " g3::Matrix{Float64})" << endl
<< " #" << 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
<< " # Function argument sizes:" << endl
<< " # residual: Array(Float64, model.eq_nbr, 1)" << endl
<< " # g1: Array(Float64, model.eq_nbr, length(model.endo))" << endl
<< " # g2: spzeros(model.eq_nbr, length(model.endo)^2)" << endl
<< " # g3: spzeros(model.eq_nbr, length(model.endo)^3)" << endl
<< " #" << endl << endl
<< " @assert size(g3) == (" << nrows << ", " << ncols << ")" << endl
<< " static!(y, x, params, residual, g1, g2)" << endl;