From 8dadad0073f6d9a80c5621adf75c7cbde7f3ae48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Steffen=20M=C3=BCthing?= <muething@dune-project.org>
Date: Mon, 16 Dec 2013 12:57:34 +0100
Subject: [PATCH] [Release][BCRSMatrix] Improve readability of new method
setIndices()
- Use std::copy instead of homegrown copy loop
- Avoid custom counting logic for consistency check
---
dune/istl/bcrsmatrix.hh | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
diff --git a/dune/istl/bcrsmatrix.hh b/dune/istl/bcrsmatrix.hh
index ef72ae13d..e11fb5690 100644
--- a/dune/istl/bcrsmatrix.hh
+++ b/dune/istl/bcrsmatrix.hh
@@ -1194,17 +1194,15 @@ namespace Dune {
template<typename It>
void setIndices(size_type row, It begin, It end)
{
- size_type cols = 0;
- size_type* col_it = r[row].getindexptr();
- for (; begin != end; ++begin, ++col_it, ++cols)
- {
- *col_it = *begin;
- }
- if (cols != r[row].size())
+ size_type row_size = r[row].size();
+ size_type* col_begin = r[row].getindexptr();
+ size_type* col_end;
+ // consistency check between allocated row size and number of passed column indices
+ if ((col_end = std::copy(begin,end,r[row].getindexptr())) != col_begin + row_size)
DUNE_THROW(BCRSMatrixError,"Given size of row " << row
- << " (" << r[row].size()
- << ") does not match number of passed entries (" << cols << ")");
- std::sort(r[row].getindexptr(),r[row].getindexptr() + cols);
+ << " (" << row_size
+ << ") does not match number of passed entries (" << (col_end - col_begin) << ")");
+ std::sort(col_begin,col_end);
}
//! indicate that all indices are defined, check consistency
--
GitLab