Reactivate use_dll mode
parent
968e411c31
commit
c7c26190d6
|
@ -2604,19 +2604,16 @@ DynamicModel::writeDynamicModel(const string &dynamic_basename, ostream &Dynamic
|
||||||
|
|
||||||
writeDynamicMatlabCompatLayer(dynamic_basename);
|
writeDynamicMatlabCompatLayer(dynamic_basename);
|
||||||
}
|
}
|
||||||
/*
|
|
||||||
|
|
||||||
else if (output_type == oCDynamicModel)
|
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
|
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
|
<< "{" << endl
|
||||||
<< " double lhs, rhs;" << endl
|
<< " double lhs, rhs;" << endl
|
||||||
<< endl
|
<< endl
|
||||||
<< " * Residual equations *" << endl
|
<< " /* Residual equations */" << endl
|
||||||
<< model_local_vars_output.str()
|
|
||||||
<< model_tt_output.str()
|
<< model_tt_output.str()
|
||||||
<< model_output.str()
|
<< model_output.str()
|
||||||
<< " * Jacobian *" << endl
|
<< " /* Jacobian */" << endl
|
||||||
<< " if (g1 == NULL)" << endl
|
<< " if (g1 == NULL)" << endl
|
||||||
<< " return;" << endl
|
<< " return;" << endl
|
||||||
<< endl
|
<< endl
|
||||||
|
@ -2625,7 +2622,7 @@ DynamicModel::writeDynamicModel(const string &dynamic_basename, ostream &Dynamic
|
||||||
<< endl;
|
<< endl;
|
||||||
|
|
||||||
if (second_derivatives.size())
|
if (second_derivatives.size())
|
||||||
DynamicOutput << " * Hessian for endogenous and exogenous variables *" << endl
|
DynamicOutput << " /* Hessian for endogenous and exogenous variables */" << endl
|
||||||
<< " if (v2 == NULL)" << endl
|
<< " if (v2 == NULL)" << endl
|
||||||
<< " return;" << endl
|
<< " return;" << endl
|
||||||
<< endl
|
<< endl
|
||||||
|
@ -2634,7 +2631,7 @@ DynamicModel::writeDynamicModel(const string &dynamic_basename, ostream &Dynamic
|
||||||
<< endl;
|
<< endl;
|
||||||
|
|
||||||
if (third_derivatives.size())
|
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
|
<< " if (v3 == NULL)" << endl
|
||||||
<< " return;" << endl
|
<< " return;" << endl
|
||||||
<< endl
|
<< endl
|
||||||
|
@ -2644,7 +2641,6 @@ DynamicModel::writeDynamicModel(const string &dynamic_basename, ostream &Dynamic
|
||||||
|
|
||||||
DynamicOutput << "}" << endl << endl;
|
DynamicOutput << "}" << endl << endl;
|
||||||
}
|
}
|
||||||
*/
|
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
string filename = dynamic_basename + "Dynamic.jl";
|
string filename = dynamic_basename + "Dynamic.jl";
|
||||||
|
|
|
@ -1632,36 +1632,37 @@ StaticModel::writeStaticModel(const string &basename,
|
||||||
}
|
}
|
||||||
else if (output_type == oCStaticModel)
|
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
|
StaticOutput << "void Static(double *y, double *x, int nb_row_x, double *params, double *residual, double *g1, double *v2)" << endl
|
||||||
<< "{" << endl
|
<< "{" << endl
|
||||||
<< " double lhs, rhs;" << endl
|
<< " double lhs, rhs;" << endl
|
||||||
<< endl
|
<< endl
|
||||||
<< " * Residual equations *" << endl
|
<< " /* Residual equations */" << endl
|
||||||
<< model_local_vars_output.str()
|
<< model_tt_output.str()
|
||||||
<< model_output.str()
|
<< model_output.str()
|
||||||
<< " * Jacobian *" << endl
|
<< " /* Jacobian */" << endl
|
||||||
<< " if (g1 == NULL)" << endl
|
<< " if (g1 == NULL)" << endl
|
||||||
<< " return;" << endl
|
<< " return;" << endl
|
||||||
<< endl
|
<< endl
|
||||||
|
<< jacobian_tt_output.str()
|
||||||
<< jacobian_output.str()
|
<< jacobian_output.str()
|
||||||
<< endl;
|
<< endl;
|
||||||
|
|
||||||
if (second_derivatives.size())
|
if (second_derivatives.size())
|
||||||
StaticOutput << " * Hessian for endogenous and exogenous variables *" << endl
|
StaticOutput << " /* Hessian for endogenous and exogenous variables */" << endl
|
||||||
<< " if (v2 == NULL)" << endl
|
<< " if (v2 == NULL)" << endl
|
||||||
<< " return;" << endl
|
<< " return;" << endl
|
||||||
<< endl
|
<< endl
|
||||||
|
<< hessian_tt_output.str()
|
||||||
<< hessian_output.str()
|
<< hessian_output.str()
|
||||||
<< endl;
|
<< endl;
|
||||||
if (third_derivatives.size())
|
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
|
<< " if (v3 == NULL)" << endl
|
||||||
<< " return;" << endl
|
<< " return;" << endl
|
||||||
<< endl
|
<< endl
|
||||||
|
<< third_derivatives_tt_output.str()
|
||||||
<< third_derivatives_output.str()
|
<< third_derivatives_output.str()
|
||||||
<< endl;
|
<< endl;
|
||||||
*/
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue