From c6a17913b4822cd0180b85dfc636644734c82a76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= <sebastien@dynare.org>
Date: Wed, 20 May 2020 11:44:40 +0200
Subject: [PATCH] Rename {Static,Dynamic}Model::writeOutput() to
::writeDriverOutput() for clarity
---
src/DynamicModel.cc | 2 +-
src/DynamicModel.hh | 4 ++--
src/ModFile.cc | 10 +++++-----
src/StaticModel.cc | 2 +-
src/StaticModel.hh | 4 ++--
5 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/DynamicModel.cc b/src/DynamicModel.cc
index 416d5abb..71782a1e 100644
--- a/src/DynamicModel.cc
+++ b/src/DynamicModel.cc
@@ -2820,7 +2820,7 @@ DynamicModel::writeBlockDriverOutput(ostream &output, const string &basename, co
}
void
-DynamicModel::writeOutput(ostream &output, const string &basename, bool block_decomposition, bool linear_decomposition, bool use_dll, bool estimation_present, bool compute_xrefs, bool julia) const
+DynamicModel::writeDriverOutput(ostream &output, const string &basename, bool block_decomposition, bool linear_decomposition, bool use_dll, bool estimation_present, bool compute_xrefs, bool julia) const
{
/* Writing initialisation for M_.lead_lag_incidence matrix
M_.lead_lag_incidence is a matrix with as many columns as there are
diff --git a/src/DynamicModel.hh b/src/DynamicModel.hh
index 885cbbcf..d8345b70 100644
--- a/src/DynamicModel.hh
+++ b/src/DynamicModel.hh
@@ -290,8 +290,8 @@ public:
*/
void computingPass(bool jacobianExo, int derivsOrder, int paramsDerivsOrder,
const eval_context_t &eval_context, bool no_tmp_terms, bool block, bool use_dll, bool bytecode, bool linear_decomposition);
- //! Writes model initialization and lead/lag incidence matrix to output
- void writeOutput(ostream &output, const string &basename, bool block, bool linear_decomposition, bool use_dll, bool estimation_present, bool compute_xrefs, bool julia) const;
+ //! Writes information about the dynamic model to the driver file
+ void writeDriverOutput(ostream &output, const string &basename, bool block, bool linear_decomposition, bool use_dll, bool estimation_present, bool compute_xrefs, bool julia) const;
//! Write JSON AST
void writeJsonAST(ostream &output) const;
diff --git a/src/ModFile.cc b/src/ModFile.cc
index e36d473d..eeff5fc4 100644
--- a/src/ModFile.cc
+++ b/src/ModFile.cc
@@ -1021,10 +1021,10 @@ ModFile::writeOutputFiles(const string &basename, bool clear_all, bool clear_glo
if (dynamic_model.equation_number() > 0)
{
if (linear_decomposition)
- non_linear_equations_dynamic_model.writeOutput(mOutputFile, basename, block, true, use_dll, mod_file_struct.estimation_present, compute_xrefs, false);
- dynamic_model.writeOutput(mOutputFile, basename, block, false, use_dll, mod_file_struct.estimation_present, compute_xrefs, false);
+ non_linear_equations_dynamic_model.writeDriverOutput(mOutputFile, basename, block, true, use_dll, mod_file_struct.estimation_present, compute_xrefs, false);
+ dynamic_model.writeDriverOutput(mOutputFile, basename, block, false, use_dll, mod_file_struct.estimation_present, compute_xrefs, false);
if (!no_static)
- static_model.writeOutput(mOutputFile, block);
+ static_model.writeDriverOutput(mOutputFile, block);
}
if (onlymodel || gui)
@@ -1252,8 +1252,8 @@ ModFile::writeExternalFilesJulia(const string &basename) const
if (dynamic_model.equation_number() > 0)
{
- dynamic_model.writeOutput(jlOutputFile, basename, false, false, false,
- mod_file_struct.estimation_present, false, true);
+ dynamic_model.writeDriverOutput(jlOutputFile, basename, false, false, false,
+ mod_file_struct.estimation_present, false, true);
if (!no_static)
{
static_model.writeStaticFile(basename, false, false, false, "", {}, {}, true);
diff --git a/src/StaticModel.cc b/src/StaticModel.cc
index 02c81bcd..a1d5de10 100644
--- a/src/StaticModel.cc
+++ b/src/StaticModel.cc
@@ -1795,7 +1795,7 @@ StaticModel::writeStaticBlockMFile(const string &basename) const
}
void
-StaticModel::writeOutput(ostream &output, bool block) const
+StaticModel::writeDriverOutput(ostream &output, bool block) const
{
output << "M_.static_tmp_nbr = [";
for (const auto &temporary_terms_derivative : temporary_terms_derivatives)
diff --git a/src/StaticModel.hh b/src/StaticModel.hh
index db347c79..3ebf93a9 100644
--- a/src/StaticModel.hh
+++ b/src/StaticModel.hh
@@ -122,8 +122,8 @@ public:
//! Creates the static version of a dynamic model
explicit StaticModel(const DynamicModel &m);
- //! Writes information on block decomposition when relevant
- void writeOutput(ostream &output, bool block) const;
+ //! Writes information about the static model to the driver file
+ void writeDriverOutput(ostream &output, bool block) const;
//! Execute computations (variable sorting + derivation)
/*!
--
GitLab