From c7c26190d6c0aeb695cdb544e7a8ce51b03a0b3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= <sebastien@dynare.org> Date: Fri, 25 May 2018 15:48:55 +0200 Subject: [PATCH] Reactivate use_dll mode --- src/DynamicModel.cc | 12 ++++-------- src/StaticModel.cc | 15 ++++++++------- 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/src/DynamicModel.cc b/src/DynamicModel.cc index e9427419..222a6877 100644 --- a/src/DynamicModel.cc +++ b/src/DynamicModel.cc @@ -2604,19 +2604,16 @@ DynamicModel::writeDynamicModel(const string &dynamic_basename, ostream &Dynamic writeDynamicMatlabCompatLayer(dynamic_basename); } - /* - else if (output_type == oCDynamicModel) { DynamicOutput << "void Dynamic(double *y, double *x, int nb_row_x, double *params, double *steady_state, int it_, double *residual, double *g1, double *v2, double *v3)" << endl << "{" << endl << " double lhs, rhs;" << endl << endl - << " * Residual equations *" << endl - << model_local_vars_output.str() + << " /* Residual equations */" << endl << model_tt_output.str() << model_output.str() - << " * Jacobian *" << endl + << " /* Jacobian */" << endl << " if (g1 == NULL)" << endl << " return;" << endl << endl @@ -2625,7 +2622,7 @@ DynamicModel::writeDynamicModel(const string &dynamic_basename, ostream &Dynamic << endl; if (second_derivatives.size()) - DynamicOutput << " * Hessian for endogenous and exogenous variables *" << endl + DynamicOutput << " /* Hessian for endogenous and exogenous variables */" << endl << " if (v2 == NULL)" << endl << " return;" << endl << endl @@ -2634,7 +2631,7 @@ DynamicModel::writeDynamicModel(const string &dynamic_basename, ostream &Dynamic << endl; if (third_derivatives.size()) - DynamicOutput << " * Third derivatives for endogenous and exogenous variables *" << endl + DynamicOutput << " /* Third derivatives for endogenous and exogenous variables */" << endl << " if (v3 == NULL)" << endl << " return;" << endl << endl @@ -2644,7 +2641,6 @@ DynamicModel::writeDynamicModel(const string &dynamic_basename, ostream &Dynamic DynamicOutput << "}" << endl << endl; } - */ else { string filename = dynamic_basename + "Dynamic.jl"; diff --git a/src/StaticModel.cc b/src/StaticModel.cc index e90b2ff4..6d0df06a 100644 --- a/src/StaticModel.cc +++ b/src/StaticModel.cc @@ -1632,36 +1632,37 @@ StaticModel::writeStaticModel(const string &basename, } else if (output_type == oCStaticModel) { - /* StaticOutput << "void Static(double *y, double *x, int nb_row_x, double *params, double *residual, double *g1, double *v2)" << endl << "{" << endl << " double lhs, rhs;" << endl << endl - << " * Residual equations *" << endl - << model_local_vars_output.str() + << " /* Residual equations */" << endl + << model_tt_output.str() << model_output.str() - << " * Jacobian *" << endl + << " /* Jacobian */" << endl << " if (g1 == NULL)" << endl << " return;" << endl << endl + << jacobian_tt_output.str() << jacobian_output.str() << endl; if (second_derivatives.size()) - StaticOutput << " * Hessian for endogenous and exogenous variables *" << endl + StaticOutput << " /* Hessian for endogenous and exogenous variables */" << endl << " if (v2 == NULL)" << endl << " return;" << endl << endl + << hessian_tt_output.str() << hessian_output.str() << endl; if (third_derivatives.size()) - StaticOutput << " * Third derivatives for endogenous and exogenous variables *" << endl + StaticOutput << " /* Third derivatives for endogenous and exogenous variables */" << endl << " if (v3 == NULL)" << endl << " return;" << endl << endl + << third_derivatives_tt_output.str() << third_derivatives_output.str() << endl; - */ } else { -- GitLab