diff --git a/src/ModelTree.cc b/src/ModelTree.cc index 1f823ec1365a69ebbab7da1e501077bea1697d46..70a4cd03fbea50975b21b22c7827cceffa21bd5c 100644 --- a/src/ModelTree.cc +++ b/src/ModelTree.cc @@ -1398,8 +1398,7 @@ ModelTree::writeLatexModelFile(const string& mod_basename, const string& latex_b content_output << endl << R"(\end{dmath})" << endl; } - output << R"(\include{)" << latex_basename + "_content" - << "}" << endl + output << R"(\include{)" << latex_basename + "_content" << "}" << endl << R"(\end{document})" << endl; output.close(); diff --git a/src/ModelTree.hh b/src/ModelTree.hh index 97363ff985695aa0d8ce176b6f03445ebfbc182c..ee494eb1be9c7105951776fbe6493d2cdf55e03a 100644 --- a/src/ModelTree.hh +++ b/src/ModelTree.hh @@ -1004,9 +1004,8 @@ ModelTree::writeModelCFile(const string& basename, const string& mexext, const filesystem::path model_src_dir {filesystem::path {basename} / "model" / "src"}; - auto [d_output, tt_output] = writeModelFileHelper < dynamic - ? ExprNodeOutputType::CDynamicModel - : ExprNodeOutputType::CStaticModel > (); + auto [d_output, tt_output] = writeModelFileHelper<dynamic ? ExprNodeOutputType::CDynamicModel + : ExprNodeOutputType::CStaticModel>(); vector<filesystem::path> header_files, object_files; // TODO: when C++20 support is complete, mark the following strings constexpr @@ -2376,9 +2375,9 @@ ModelTree::writeSparseModelJuliaFiles(const string& basename) const { assert(heterogeneity_table.empty()); - auto [d_sparse_output, tt_sparse_output] = writeModelFileHelper < dynamic - ? ExprNodeOutputType::juliaSparseDynamicModel - : ExprNodeOutputType::juliaSparseStaticModel > (); + auto [d_sparse_output, tt_sparse_output] + = writeModelFileHelper<dynamic ? ExprNodeOutputType::juliaSparseDynamicModel + : ExprNodeOutputType::juliaSparseStaticModel>(); filesystem::path julia_dir {filesystem::path {basename} / "model" / "julia"}; // TODO: when C++20 support is complete, mark the following strings constexpr diff --git a/src/Shocks.hh b/src/Shocks.hh index 96138111624870ad4638e9af3714bd2fa942a279..dc021e4ab7604d422ad624c2393a9d87b75f4d40 100644 --- a/src/Shocks.hh +++ b/src/Shocks.hh @@ -41,7 +41,7 @@ public: using det_shocks_t = map<int, vector<pair<period_range_t, expr_t>>>; enum class ShockType { - level, // The value is the level of the exogenous (“values†statement in “shocksâ€) + level, // The value is the level of the exogenous (“values†statement in “shocksâ€) multiplySteadyState, // The value is the ratio of the exogenous over its (terminal) steady state // (“values†statement in “mshocksâ€) multiplyInitialSteadyState // The value is the ratio of the exogenous over its initial steady @@ -132,8 +132,8 @@ public: enum class LearntShockType { level, // The value is the level of the exogenous (“values†statement in “shocks(learnt_in=…)â€) - add, // The value is the additive change of the exogenous compared to previous information - // period (“add†statement in “shocks(learnt_in=…)â€) + add, // The value is the additive change of the exogenous compared to previous information + // period (“add†statement in “shocks(learnt_in=…)â€) multiply, // The value is the multiplicative change of the exogenous compared to previous // information period (“multiply†statement in “shocks(learnt_in=…)â€) multiplySteadyState, // The value is the ratio of the exogenous over its (terminal) steady state