Further simplification made possible by 75e453c5fe53ce9ce82e564577db073b41a0459a

master
Sébastien Villemot 2022-07-12 15:18:36 +02:00
parent 7fd78606ae
commit 440173f2bc
No known key found for this signature in database
GPG Key ID: 2CECE9350ECEBE4A
1 changed files with 2 additions and 3 deletions

View File

@ -1852,7 +1852,6 @@ StaticModel::writeJsonComputingPassOutput(ostream &output, bool writeDetails) co
d_output[0] << ", ";
writeJsonModelEquations(d_output[0], true);
auto getJacobCol = [this](int var) { return symbol_table.getTypeSpecificID(getSymbIDByDerivID(var)); };
int ncols = symbol_table.endo_nbr();
for (size_t i = 1; i < derivatives.size(); i++)
{
@ -1876,7 +1875,7 @@ StaticModel::writeJsonComputingPassOutput(ostream &output, bool writeDetails) co
for (size_t j = 1; j < vidx.size(); j++)
{
col_idx *= symbol_table.endo_nbr();
col_idx += getJacobCol(vidx[j]);
col_idx += getJacobianCol(vidx[j]);
}
if (writeDetails)
@ -1888,7 +1887,7 @@ StaticModel::writeJsonComputingPassOutput(ostream &output, bool writeDetails) co
if (i == 2 && vidx[1] != vidx[2]) // Symmetric elements in hessian
{
int col_idx_sym = getJacobCol(vidx[2]) * symbol_table.endo_nbr() + getJacobCol(vidx[1]);
int col_idx_sym = getJacobianCol(vidx[2]) * symbol_table.endo_nbr() + getJacobianCol(vidx[1]);
d_output[i] << ", " << col_idx_sym + 1;
}
if (i > 1)