From 6af8a57f9f0d4f5f4ad4fabdd1a3653d28b95041 Mon Sep 17 00:00:00 2001 From: MichelJuillard <michel.juillard@mjui.fr> Date: Wed, 26 Oct 2022 21:19:03 +0200 Subject: [PATCH] replace Julia modules by simple functions --- src/DynamicModel.cc | 6 +----- src/StaticModel.cc | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/src/DynamicModel.cc b/src/DynamicModel.cc index 965ddc7c..4defadc9 100644 --- a/src/DynamicModel.cc +++ b/src/DynamicModel.cc @@ -3530,9 +3530,6 @@ DynamicModel::writeSetAuxiliaryVariables(const string &basename, bool julia) con string comment = julia ? "#" : "%"; stringstream output; - if (julia) - output << "module " << basename << "DynamicSetAuxiliarySeries" << endl - << "export " << func_name << endl; output << "function "; if (!julia) output << "ds = "; @@ -3547,8 +3544,7 @@ DynamicModel::writeSetAuxiliaryVariables(const string &basename, bool julia) con output << output_func_body.str() << "end" << endl; if (julia) - output << "end" << endl - << "end" << endl; + output << "end" << endl; if (julia) writeToFileIfModified(output, basename + "DynamicSetAuxiliarySeries.jl"); diff --git a/src/StaticModel.cc b/src/StaticModel.cc index ad672e87..0302d78f 100644 --- a/src/StaticModel.cc +++ b/src/StaticModel.cc @@ -1189,9 +1189,6 @@ StaticModel::writeSetAuxiliaryVariables(const string &basename, bool julia) cons string comment = julia ? "#" : "%"; stringstream output; - if (julia) - output << "module " << basename << "SetAuxiliaryVariables" << endl - << "export " << func_name << endl; output << "function "; if (!julia) output << "y = "; @@ -1206,8 +1203,7 @@ StaticModel::writeSetAuxiliaryVariables(const string &basename, bool julia) cons output << output_func_body.str() << "end" << endl; if (julia) - output << "end" << endl - << "end" << endl; + output << "end" << endl; if (julia) writeToFileIfModified(output, basename + "SetAuxiliaryVariables.jl"); -- GitLab