From 7d16fff786c477c7ff6ddf8a52a0fa61b670eb50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= <sebastien@dynare.org>
Date: Thu, 21 Feb 2019 12:16:22 +0100
Subject: [PATCH] Further simplifications
---
src/DynamicModel.cc | 4 ++--
src/ModelEquationBlock.cc | 8 ++++----
src/ModelTree.cc | 2 +-
src/StaticModel.cc | 2 +-
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/DynamicModel.cc b/src/DynamicModel.cc
index 82d02788..faedb6a6 100644
--- a/src/DynamicModel.cc
+++ b/src/DynamicModel.cc
@@ -57,7 +57,7 @@ DynamicModel::copyHelper(const DynamicModel &m)
first_chain_rule_derivatives[it.first] = f(it.second);
for (const auto &it : m.equation_type_and_normalized_equation)
- equation_type_and_normalized_equation.push_back({it.first, f(it.second)});
+ equation_type_and_normalized_equation.emplace_back(it.first, f(it.second));
for (const auto &it : m.blocks_derivatives)
{
@@ -4464,7 +4464,7 @@ DynamicModel::getPacMaxLag(const string &pac_model_name, map<pair<string, string
break;
}
string eq = eqtag_and_lag[{pac_model_name, eqtag}].first;
- eqtag_and_lag[{pac_model_name, eqtag}] = {eq, equation->PacMaxLag((*(endogs.begin())).first)};
+ eqtag_and_lag[{pac_model_name, eqtag}] = {eq, equation->PacMaxLag(endogs.begin()->first)};
}
}
diff --git a/src/ModelEquationBlock.cc b/src/ModelEquationBlock.cc
index 67778bed..cfb513ce 100644
--- a/src/ModelEquationBlock.cc
+++ b/src/ModelEquationBlock.cc
@@ -36,7 +36,7 @@ SteadyStateModel::SteadyStateModel(const SteadyStateModel &m) :
static_model {m.static_model}
{
for (const auto &it : m.def_table)
- def_table.push_back({it.first, it.second->clone(*this)});
+ def_table.emplace_back(it.first, it.second->clone(*this));
}
SteadyStateModel &
@@ -48,7 +48,7 @@ SteadyStateModel::operator=(const SteadyStateModel &m)
def_table.clear();
for (const auto &it : m.def_table)
- def_table.push_back({it.first, it.second->clone(*this)});
+ def_table.emplace_back(it.first, it.second->clone(*this));
return *this;
}
@@ -298,7 +298,7 @@ Epilogue::Epilogue(const Epilogue &m) :
DynamicModel {m}
{
for (const auto &it : m.def_table)
- def_table.push_back({it.first, it.second->clone(*this)});
+ def_table.emplace_back(it.first, it.second->clone(*this));
}
Epilogue &
@@ -308,7 +308,7 @@ Epilogue::operator=(const Epilogue &m)
def_table.clear();
for (const auto &it : m.def_table)
- def_table.push_back({it.first, it.second->clone(*this)});
+ def_table.emplace_back(it.first, it.second->clone(*this));
return *this;
}
diff --git a/src/ModelTree.cc b/src/ModelTree.cc
index febb1e68..3b438355 100644
--- a/src/ModelTree.cc
+++ b/src/ModelTree.cc
@@ -411,7 +411,7 @@ ModelTree::evaluateAndReduceJacobian(const eval_context_t &eval_context, jacob_m
{
if (verbose)
cout << "the coefficient related to variable " << var << " with lag " << lag << " in equation " << eq << " is equal to " << val << " and is set to 0 in the incidence matrix (size=" << symbol_table.endo_nbr() << ")" << endl;
- jacobian_elements_to_delete.insert({ eq, deriv_id });
+ jacobian_elements_to_delete.emplace(eq, deriv_id);
}
else
{
diff --git a/src/StaticModel.cc b/src/StaticModel.cc
index ea2b3e1e..5a75c2c2 100644
--- a/src/StaticModel.cc
+++ b/src/StaticModel.cc
@@ -55,7 +55,7 @@ StaticModel::copyHelper(const StaticModel &m)
first_chain_rule_derivatives[it.first] = f(it.second);
for (const auto &it : m.equation_type_and_normalized_equation)
- equation_type_and_normalized_equation.push_back({it.first, f(it.second)});
+ equation_type_and_normalized_equation.emplace_back(it.first, f(it.second));
for (const auto &it : m.blocks_derivatives)
{
--
GitLab