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

simplify modules created by preprocessor

issue#70
Houtan Bastani 2015-07-28 17:48:42 +02:00
parent e73630454d
commit 389bb89a55
4 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
DynamicModel.cc
View File

@ -3833,11 +3833,8 @@ DynamicModel::writeParamsDerivativesFile(const string &basename, bool julia) con
<< "% from model file (.mod)" << endl << endl;
else
paramsDerivsFile << "module " << basename << "DynamicParamsDerivs" << endl << endl
<< "export getParamsDerivsFunction" << endl << endl
<< "function getParamsDerivsFunction" << endl
<< " params_derivatives" << endl
<< "end" << endl << endl
<< "function params_derivatives(y, x, paramssteady_state, it_, "
<< "export params_derivs" << endl << endl
<< "function params_derivs(y, x, paramssteady_state, it_, "
<< "ss_param_deriv, ss_param_2nd_deriv)" << endl;
deriv_node_temp_terms_t tef_terms;

7
ModFile.cc
View File

@ -1132,19 +1132,18 @@ ModFile::writeExternalFilesJulia(const string &basename, FileOutputType output)
<< "try" << endl
<< " using " << basename << "StaticParamsDerivs" << endl
<< " model__.static_params_derivs = " << basename
<< "StaticParamsDerivs.getParamsDerivsFunction()" << endl
<< "StaticParamsDerivs.params_derivs" << endl
<< "catch" << endl
<< "end" << endl
<< "try" << endl
<< " using " << basename << "DynamicParamsDerivs" << endl
<< " model__.dynamic_params_derivs = " << basename
<< "DynamicParamsDerivs.getParamsDerivsFunction()" << endl
<< "DynamicParamsDerivs.params_derivs" << endl
<< "catch" << endl
<< "end" << endl
<< "try" << endl
<< " using " << basename << "SteadyState2" << endl
<< " model__.steady_state = " << basename
<< "SteadyState2.getSteadyStateFunction()" << endl
<< " model__.steady_state = " << basename << "SteadyState2.steady_state" << endl
<< "catch" << endl
<< "end" << endl
<< "end" << endl;

7
StaticModel.cc
View File

@ -2040,11 +2040,8 @@ StaticModel::writeParamsDerivativesFile(const string &basename, bool julia) cons
<< "% from model file (.mod)" << endl << endl;
else
paramsDerivsFile << "module " << basename << "StaticParamsDerivs" << endl << endl
<< "export getParamsDerivsFunction" << endl << endl
<< "function getParamsDerivsFunction" << endl
<< " params_derivatives" << endl
<< "end" << endl << endl
<< "function params_derivatives(y, x, params)" << endl;
<< "export params_derivs" << endl << endl
<< "function params_derivs(y, x, params)" << endl;
deriv_node_temp_terms_t tef_terms;
writeModelLocalVariables(paramsDerivsFile, output_type, tef_terms);

5
SteadyStateModel.cc
View File

@ -128,10 +128,7 @@ SteadyStateModel::writeSteadyStateFile(const string &basename, bool ramsey_model
<< " info = 0;" << endl;
else
output << "module " << basename << "SteadyState2" << endl << endl
<< "export getSteadyStateFunction" << endl << endl
<< "function getSteadyStateFunction()" << endl
<< " steady_state" << endl
<< "end" << endl << endl
<< "export steady_state" << endl << endl
<< "function steady_state(ys_, exo_, params)" << endl
<< " info = 0" << endl;