[cleanup] Rename member monitors_ to criteria_

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);
             }

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_;
 };