Merge branch 'ramsey_k_order' into 'master'
Allows to write M_.objective_tmp_nbr in the driver.m file See merge request Dynare/preprocessor!41issue#70
commit
a5d653a5f1
|
@ -2214,7 +2214,11 @@ PlannerObjectiveStatement::writeOutput(ostream &output, const string &basename,
|
|||
output << "M_.NNZDerivatives_objective = [";
|
||||
for (int i=1; i < static_cast<int>(model_tree.getNNZDerivatives().size()); i++)
|
||||
output << (i > model_tree.getComputedDerivsOrder() ? -1 : model_tree.getNNZDerivatives()[i]) << ";";
|
||||
output << "];";
|
||||
output << "];" << endl;
|
||||
output << "M_.objective_tmp_nbr = [";
|
||||
for (const auto &temporary_terms_derivative : model_tree.getTemporaryTermsDerivatives())
|
||||
output << temporary_terms_derivative.size() << "; ";
|
||||
output << "];" << endl;
|
||||
model_tree.writeStaticFile(basename + ".objective", false, false, false, "", {}, {}, false);
|
||||
}
|
||||
|
||||
|
|
|
@ -462,6 +462,13 @@ public:
|
|||
return NNZDerivatives;
|
||||
}
|
||||
|
||||
//! Returns the vector of temporary terms derivatives
|
||||
inline const vector<temporary_terms_t> &
|
||||
getTemporaryTermsDerivatives() const
|
||||
{
|
||||
return temporary_terms_derivatives;
|
||||
}
|
||||
|
||||
//!Returns the maximum order of computed derivatives
|
||||
inline int
|
||||
getComputedDerivsOrder() const
|
||||
|
|
Loading…
Reference in New Issue