remove unnecessary get*Function functions

issue#70
Houtan Bastani 2015-08-19 11:28:25 +02:00
parent 6156c76f79
commit cbe1027428
4 changed files with 6 additions and 15 deletions

View File

@ -1577,10 +1577,7 @@ DynamicModel::writeDynamicJuliaFile(const string &basename) const
output << "module " << basename << "Dynamic" << endl << endl
<< "using Utils" << endl << endl
<< "export getDynamicFunction" << endl << endl
<< "function getDynamicFunction()" << endl
<< " dynamic!" << endl
<< "end" << endl << endl;
<< "export dynamic!" << endl << endl;
writeDynamicModel(output, false, true);
output << "end" << endl;
output.close();

View File

@ -1145,9 +1145,9 @@ ModFile::writeExternalFilesJulia(const string &basename, FileOutputType output)
}
steady_state_model.writeSteadyStateFile(basename, mod_file_struct.ramsey_model_present, true);
jlOutputFile << "model.static = " << basename << "Static.getStaticFunction()" << endl
<< "model.dynamic = " << basename << "Dynamic.getDynamicFunction()" << endl
<< "model.steady_state = " << basename << "SteadyState2.getSteadyStateFunction()" << endl
jlOutputFile << "model.static = " << basename << "Static.static!" << endl
<< "model.dynamic = " << basename << "Dynamic.dynamic!" << endl
<< "model.steady_state = " << basename << "SteadyState2.steady_state!" << endl
<< "try" << endl
<< " using " << basename << "StaticParamsDerivs" << endl
<< " model.static_params_derivs = " << basename

View File

@ -1590,10 +1590,7 @@ StaticModel::writeStaticJuliaFile(const string &basename) const
output << "module " << basename << "Static" << endl << endl
<< "using Utils" << endl << endl
<< "export getStaticFunction" << endl << endl
<< "function getStaticFunction()" << endl
<< " static!" << endl
<< "end" << endl << endl;
<< "export static!" << endl << endl;
writeStaticModel(output, false, true);
output << "end" << endl;
}

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;
for (size_t i = 0; i < def_table.size(); i++)