simplify modules created by preprocessor
parent
e73630454d
commit
389bb89a55
|
@ -3833,11 +3833,8 @@ DynamicModel::writeParamsDerivativesFile(const string &basename, bool julia) con
|
||||||
<< "% from model file (.mod)" << endl << endl;
|
<< "% from model file (.mod)" << endl << endl;
|
||||||
else
|
else
|
||||||
paramsDerivsFile << "module " << basename << "DynamicParamsDerivs" << endl << endl
|
paramsDerivsFile << "module " << basename << "DynamicParamsDerivs" << endl << endl
|
||||||
<< "export getParamsDerivsFunction" << endl << endl
|
<< "export params_derivs" << endl << endl
|
||||||
<< "function getParamsDerivsFunction" << endl
|
<< "function params_derivs(y, x, paramssteady_state, it_, "
|
||||||
<< " params_derivatives" << endl
|
|
||||||
<< "end" << endl << endl
|
|
||||||
<< "function params_derivatives(y, x, paramssteady_state, it_, "
|
|
||||||
<< "ss_param_deriv, ss_param_2nd_deriv)" << endl;
|
<< "ss_param_deriv, ss_param_2nd_deriv)" << endl;
|
||||||
|
|
||||||
deriv_node_temp_terms_t tef_terms;
|
deriv_node_temp_terms_t tef_terms;
|
||||||
|
|
|
@ -1132,19 +1132,18 @@ ModFile::writeExternalFilesJulia(const string &basename, FileOutputType output)
|
||||||
<< "try" << endl
|
<< "try" << endl
|
||||||
<< " using " << basename << "StaticParamsDerivs" << endl
|
<< " using " << basename << "StaticParamsDerivs" << endl
|
||||||
<< " model__.static_params_derivs = " << basename
|
<< " model__.static_params_derivs = " << basename
|
||||||
<< "StaticParamsDerivs.getParamsDerivsFunction()" << endl
|
<< "StaticParamsDerivs.params_derivs" << endl
|
||||||
<< "catch" << endl
|
<< "catch" << endl
|
||||||
<< "end" << endl
|
<< "end" << endl
|
||||||
<< "try" << endl
|
<< "try" << endl
|
||||||
<< " using " << basename << "DynamicParamsDerivs" << endl
|
<< " using " << basename << "DynamicParamsDerivs" << endl
|
||||||
<< " model__.dynamic_params_derivs = " << basename
|
<< " model__.dynamic_params_derivs = " << basename
|
||||||
<< "DynamicParamsDerivs.getParamsDerivsFunction()" << endl
|
<< "DynamicParamsDerivs.params_derivs" << endl
|
||||||
<< "catch" << endl
|
<< "catch" << endl
|
||||||
<< "end" << endl
|
<< "end" << endl
|
||||||
<< "try" << endl
|
<< "try" << endl
|
||||||
<< " using " << basename << "SteadyState2" << endl
|
<< " using " << basename << "SteadyState2" << endl
|
||||||
<< " model__.steady_state = " << basename
|
<< " model__.steady_state = " << basename << "SteadyState2.steady_state" << endl
|
||||||
<< "SteadyState2.getSteadyStateFunction()" << endl
|
|
||||||
<< "catch" << endl
|
<< "catch" << endl
|
||||||
<< "end" << endl
|
<< "end" << endl
|
||||||
<< "end" << endl;
|
<< "end" << endl;
|
||||||
|
|
|
@ -2040,11 +2040,8 @@ StaticModel::writeParamsDerivativesFile(const string &basename, bool julia) cons
|
||||||
<< "% from model file (.mod)" << endl << endl;
|
<< "% from model file (.mod)" << endl << endl;
|
||||||
else
|
else
|
||||||
paramsDerivsFile << "module " << basename << "StaticParamsDerivs" << endl << endl
|
paramsDerivsFile << "module " << basename << "StaticParamsDerivs" << endl << endl
|
||||||
<< "export getParamsDerivsFunction" << endl << endl
|
<< "export params_derivs" << endl << endl
|
||||||
<< "function getParamsDerivsFunction" << endl
|
<< "function params_derivs(y, x, params)" << endl;
|
||||||
<< " params_derivatives" << endl
|
|
||||||
<< "end" << endl << endl
|
|
||||||
<< "function params_derivatives(y, x, params)" << endl;
|
|
||||||
|
|
||||||
deriv_node_temp_terms_t tef_terms;
|
deriv_node_temp_terms_t tef_terms;
|
||||||
writeModelLocalVariables(paramsDerivsFile, output_type, tef_terms);
|
writeModelLocalVariables(paramsDerivsFile, output_type, tef_terms);
|
||||||
|
|
|
@ -128,10 +128,7 @@ SteadyStateModel::writeSteadyStateFile(const string &basename, bool ramsey_model
|
||||||
<< " info = 0;" << endl;
|
<< " info = 0;" << endl;
|
||||||
else
|
else
|
||||||
output << "module " << basename << "SteadyState2" << endl << endl
|
output << "module " << basename << "SteadyState2" << endl << endl
|
||||||
<< "export getSteadyStateFunction" << endl << endl
|
<< "export steady_state" << endl << endl
|
||||||
<< "function getSteadyStateFunction()" << endl
|
|
||||||
<< " steady_state" << endl
|
|
||||||
<< "end" << endl << endl
|
|
||||||
<< "function steady_state(ys_, exo_, params)" << endl
|
<< "function steady_state(ys_, exo_, params)" << endl
|
||||||
<< " info = 0" << endl;
|
<< " info = 0" << endl;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue