From b01278ce48abdcad9f26e6712589513f67944efb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carsten=20Gr=C3=A4ser?= <graeser@dune-project.org>
Date: Wed, 29 Oct 2014 20:19:23 +0100
Subject: [PATCH] [cleanup] Rename member monitors_ to criteria_
---
dune/solvers/solvers/loopsolver.cc | 12 ++++++------
dune/solvers/solvers/loopsolver.hh | 4 ++--
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/dune/solvers/solvers/loopsolver.cc b/dune/solvers/solvers/loopsolver.cc
index 265deccd..1d73be7e 100644
--- a/dune/solvers/solvers/loopsolver.cc
+++ b/dune/solvers/solvers/loopsolver.cc
@@ -57,8 +57,8 @@ void ::LoopSolver<VectorType, BitVectorType>::solve()
std::string header = this->iterationStep_->getOutput();
std::cout << header;
- for(auto&& m: monitors_)
- std::cout << m.header();
+ for(auto&& c: criteria_)
+ std::cout << c.header();
std::cout << std::endl;
@@ -73,8 +73,8 @@ void ::LoopSolver<VectorType, BitVectorType>::solve()
for(size_t i=0; i<header.size(); ++i)
std::cout << "-";
- for(auto&& m: monitors_)
- std::cout << std::string(m.header().size(), '-');
+ for(auto&& c: criteria_)
+ std::cout << std::string(c.header().size(), '-');
std::cout << std::endl;
}
@@ -170,9 +170,9 @@ void ::LoopSolver<VectorType, BitVectorType>::solve()
std::cout << this->iterationStep_->getOutput();
bool stop = false;
- for(auto&& m: monitors_)
+ for(auto&& c: criteria_)
{
- auto r = m();
+ auto r = c();
stop = stop or std::get<0>(r);
std::cout << std::get<1>(r);
}
diff --git a/dune/solvers/solvers/loopsolver.hh b/dune/solvers/solvers/loopsolver.hh
index 6b7e854c..53220ca9 100644
--- a/dune/solvers/solvers/loopsolver.hh
+++ b/dune/solvers/solvers/loopsolver.hh
@@ -67,7 +67,7 @@ public:
template<class... Args>
void addCriterion(Args&&... args)
{
- monitors_.emplace_back(std::forward<Args>(args)...);
+ criteria_.emplace_back(std::forward<Args>(args)...);
}
/**
@@ -90,7 +90,7 @@ public:
const VectorType* referenceSolution_;
protected:
- std::vector<Dune::Solvers::Criterion> monitors_;
+ std::vector<Dune::Solvers::Criterion> criteria_;
int iter_;
};
--
GitLab