From bc49d06e61cad4f06ecf4449127dd9f3c43717c6 Mon Sep 17 00:00:00 2001 From: Houtan Bastani Date: Tue, 28 Jul 2015 17:48:42 +0200 Subject: [PATCH] simplify modules created by preprocessor --- preprocessor/DynamicModel.cc | 7 ++----- preprocessor/ModFile.cc | 7 +++---- preprocessor/StaticModel.cc | 7 ++----- preprocessor/SteadyStateModel.cc | 5 +---- 4 files changed, 8 insertions(+), 18 deletions(-) diff --git a/preprocessor/DynamicModel.cc b/preprocessor/DynamicModel.cc index 5e691c932..29f478f05 100644 --- a/preprocessor/DynamicModel.cc +++ b/preprocessor/DynamicModel.cc @@ -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; diff --git a/preprocessor/ModFile.cc b/preprocessor/ModFile.cc index 6f6b0fe12..8e903d21e 100644 --- a/preprocessor/ModFile.cc +++ b/preprocessor/ModFile.cc @@ -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; diff --git a/preprocessor/StaticModel.cc b/preprocessor/StaticModel.cc index a23a94fc2..48f17dff7 100644 --- a/preprocessor/StaticModel.cc +++ b/preprocessor/StaticModel.cc @@ -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); diff --git a/preprocessor/SteadyStateModel.cc b/preprocessor/SteadyStateModel.cc index 88614ffc6..07db0e001 100644 --- a/preprocessor/SteadyStateModel.cc +++ b/preprocessor/SteadyStateModel.cc @@ -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;