From 07f5de36795bf62807e63f0f66f1841a70172d4a Mon Sep 17 00:00:00 2001
From: MichelJuillard <michel.juillard@mjui.fr>
Date: Fri, 31 Mar 2023 11:40:40 +0200
Subject: [PATCH] remove param derivatives rpp gpp hp g3p
---
src/DynamicModel.hh | 11 ++---------
src/StaticModel.hh | 9 ++-------
2 files changed, 4 insertions(+), 16 deletions(-)
diff --git a/src/DynamicModel.hh b/src/DynamicModel.hh
index 7e53abb5..38c59585 100644
--- a/src/DynamicModel.hh
+++ b/src/DynamicModel.hh
@@ -763,22 +763,15 @@ DynamicModel::writeParamsDerivativesFile(const string &basename) const
<< "function dynamic_params_derivs(y, x, params, steady_state, it_,"
<< "ss_param_deriv, ss_param_2nd_deriv)" << endl
<< "@inbounds begin" << endl
+ << "T = zeros(" << params_derivs_temporary_terms_idxs.size() << ")" << endl
<< tt_output.str()
<< "rp = zeros(" << equations.size() << ", "
<< symbol_table.param_nbr() << ");" << endl
<< rp_output.str()
<< "gp = zeros(" << equations.size() << ", " << getJacobianColsNbr(false) << ", " << symbol_table.param_nbr() << ");" << endl
<< gp_output.str()
- << "rpp = zeros(" << params_derivatives.at({ 0, 2 }).size() << ",4);" << endl
- << rpp_output.str()
- << "gpp = zeros(" << params_derivatives.at({ 1, 2 }).size() << ",5);" << endl
- << gpp_output.str()
- << "hp = zeros(" << params_derivatives.at({ 2, 1 }).size() << ",5);" << endl
- << hp_output.str()
- << "g3p = zeros(" << params_derivatives.at({ 3, 1 }).size() << ",6);" << endl
- << g3p_output.str()
<< "end" << endl
- << "return (rp, gp, rpp, gpp, hp, g3p)" << endl
+ << "return (rp, gp)" << endl
<< "end" << endl;
writeToFileIfModified(output, filesystem::path{basename} / "model" / "julia" / "DynamicParamsDerivs.jl");
diff --git a/src/StaticModel.hh b/src/StaticModel.hh
index 5e98f28f..cf173407 100644
--- a/src/StaticModel.hh
+++ b/src/StaticModel.hh
@@ -275,6 +275,7 @@ StaticModel::writeParamsDerivativesFile(const string &basename) const
<< "#" << endl
<< "function static_params_derivs(y, x, params)" << endl
<< "@inbounds begin" << endl
+ << "T = zeros(" << params_derivs_temporary_terms_idxs.size() << ")" << endl
<< tt_output.str()
<< "rp = zeros(" << equations.size() << ", "
<< symbol_table.param_nbr() << ");" << endl
@@ -282,14 +283,8 @@ StaticModel::writeParamsDerivativesFile(const string &basename) const
<< "gp = zeros(" << equations.size() << ", " << symbol_table.endo_nbr() << ", "
<< symbol_table.param_nbr() << ");" << endl
<< gp_output.str()
- << "rpp = zeros(" << params_derivatives.at({ 0, 2 }).size() << ",4);" << endl
- << rpp_output.str()
- << "gpp = zeros(" << params_derivatives.at({ 1, 2 }).size() << ",5);" << endl
- << gpp_output.str()
- << "hp = zeros(" << params_derivatives.at({ 2, 1 }).size() << ",5);" << endl
- << hp_output.str()
<< "end" << endl
- << "return (rp, gp, rpp, gpp, hp)" << endl
+ << "return (rp, gp)" << endl
<< "end" << endl;
writeToFileIfModified(output, filesystem::path{basename} / "model" / "julia" / "StaticParamsDerivs.jl");
--
GitLab