From a87b2f7f989d1113b6cf3a76b6bc6c8eb96c93f9 Mon Sep 17 00:00:00 2001
From: Robert K <robertk@posteo.org>
Date: Fri, 28 Feb 2025 13:10:10 +0100
Subject: [PATCH 1/2] [cleanup][DenseMatrix] Use method size to obtain vector
length in bounds check.
---
dune/common/densematrix.hh | 44 +++++++++++++++++++-------------------
1 file changed, 22 insertions(+), 22 deletions(-)
diff --git a/dune/common/densematrix.hh b/dune/common/densematrix.hh
index c696c85d3..501178f59 100644
--- a/dune/common/densematrix.hh
+++ b/dune/common/densematrix.hh
@@ -375,8 +375,8 @@ namespace Dune
auto&& xx = Impl::asVector(x);
auto&& yy = Impl::asVector(y);
DUNE_ASSERT_BOUNDS((void*)(&x) != (void*)(&y));
- DUNE_ASSERT_BOUNDS(xx.N() == M());
- DUNE_ASSERT_BOUNDS(yy.N() == N());
+ DUNE_ASSERT_BOUNDS(xx.size() == M());
+ DUNE_ASSERT_BOUNDS(yy.size() == N());
using y_field_type = typename FieldTraits<Y>::field_type;
for (size_type i=0; i<rows(); ++i)
@@ -394,8 +394,8 @@ namespace Dune
auto&& xx = Impl::asVector(x);
auto&& yy = Impl::asVector(y);
DUNE_ASSERT_BOUNDS((void*)(&x) != (void*)(&y));
- DUNE_ASSERT_BOUNDS(xx.N() == N());
- DUNE_ASSERT_BOUNDS(yy.N() == M());
+ DUNE_ASSERT_BOUNDS(xx.size() == N());
+ DUNE_ASSERT_BOUNDS(yy.size() == M());
using y_field_type = typename FieldTraits<Y>::field_type;
for(size_type i = 0; i < cols(); ++i)
@@ -412,8 +412,8 @@ namespace Dune
{
auto&& xx = Impl::asVector(x);
auto&& yy = Impl::asVector(y);
- DUNE_ASSERT_BOUNDS(xx.N() == M());
- DUNE_ASSERT_BOUNDS(yy.N() == N());
+ DUNE_ASSERT_BOUNDS(xx.size() == M());
+ DUNE_ASSERT_BOUNDS(yy.size() == N());
for (size_type i=0; i<rows(); ++i)
for (size_type j=0; j<cols(); j++)
yy[i] += (*this)[i][j] * xx[j];
@@ -425,8 +425,8 @@ namespace Dune
{
auto&& xx = Impl::asVector(x);
auto&& yy = Impl::asVector(y);
- DUNE_ASSERT_BOUNDS(xx.N() == N());
- DUNE_ASSERT_BOUNDS(yy.N() == M());
+ DUNE_ASSERT_BOUNDS(xx.size() == N());
+ DUNE_ASSERT_BOUNDS(yy.size() == M());
for(size_type i = 0; i<rows(); ++i)
for (size_type j=0; j<cols(); j++)
yy[j] += (*this)[i][j]*xx[i];
@@ -438,8 +438,8 @@ namespace Dune
{
auto&& xx = Impl::asVector(x);
auto&& yy = Impl::asVector(y);
- DUNE_ASSERT_BOUNDS(xx.N() == N());
- DUNE_ASSERT_BOUNDS(yy.N() == M());
+ DUNE_ASSERT_BOUNDS(xx.size() == N());
+ DUNE_ASSERT_BOUNDS(yy.size() == M());
for (size_type i=0; i<rows(); i++)
for (size_type j=0; j<cols(); j++)
yy[j] += conjugateComplex((*this)[i][j])*xx[i];
@@ -451,8 +451,8 @@ namespace Dune
{
auto&& xx = Impl::asVector(x);
auto&& yy = Impl::asVector(y);
- DUNE_ASSERT_BOUNDS(xx.N() == M());
- DUNE_ASSERT_BOUNDS(yy.N() == N());
+ DUNE_ASSERT_BOUNDS(xx.size() == M());
+ DUNE_ASSERT_BOUNDS(yy.size() == N());
for (size_type i=0; i<rows(); i++)
for (size_type j=0; j<cols(); j++)
yy[i] -= (*this)[i][j] * xx[j];
@@ -464,8 +464,8 @@ namespace Dune
{
auto&& xx = Impl::asVector(x);
auto&& yy = Impl::asVector(y);
- DUNE_ASSERT_BOUNDS(xx.N() == N());
- DUNE_ASSERT_BOUNDS(yy.N() == M());
+ DUNE_ASSERT_BOUNDS(xx.size() == N());
+ DUNE_ASSERT_BOUNDS(yy.size() == M());
for (size_type i=0; i<rows(); i++)
for (size_type j=0; j<cols(); j++)
yy[j] -= (*this)[i][j]*xx[i];
@@ -477,8 +477,8 @@ namespace Dune
{
auto&& xx = Impl::asVector(x);
auto&& yy = Impl::asVector(y);
- DUNE_ASSERT_BOUNDS(xx.N() == N());
- DUNE_ASSERT_BOUNDS(yy.N() == M());
+ DUNE_ASSERT_BOUNDS(xx.size() == N());
+ DUNE_ASSERT_BOUNDS(yy.size() == M());
for (size_type i=0; i<rows(); i++)
for (size_type j=0; j<cols(); j++)
yy[j] -= conjugateComplex((*this)[i][j])*xx[i];
@@ -491,8 +491,8 @@ namespace Dune
{
auto&& xx = Impl::asVector(x);
auto&& yy = Impl::asVector(y);
- DUNE_ASSERT_BOUNDS(xx.N() == M());
- DUNE_ASSERT_BOUNDS(yy.N() == N());
+ DUNE_ASSERT_BOUNDS(xx.size() == M());
+ DUNE_ASSERT_BOUNDS(yy.size() == N());
for (size_type i=0; i<rows(); i++)
for (size_type j=0; j<cols(); j++)
yy[i] += alpha * (*this)[i][j] * xx[j];
@@ -505,8 +505,8 @@ namespace Dune
{
auto&& xx = Impl::asVector(x);
auto&& yy = Impl::asVector(y);
- DUNE_ASSERT_BOUNDS(xx.N() == N());
- DUNE_ASSERT_BOUNDS(yy.N() == M());
+ DUNE_ASSERT_BOUNDS(xx.size() == N());
+ DUNE_ASSERT_BOUNDS(yy.size() == M());
for (size_type i=0; i<rows(); i++)
for (size_type j=0; j<cols(); j++)
yy[j] += alpha*(*this)[i][j]*xx[i];
@@ -519,8 +519,8 @@ namespace Dune
{
auto&& xx = Impl::asVector(x);
auto&& yy = Impl::asVector(y);
- DUNE_ASSERT_BOUNDS(xx.N() == N());
- DUNE_ASSERT_BOUNDS(yy.N() == M());
+ DUNE_ASSERT_BOUNDS(xx.size() == N());
+ DUNE_ASSERT_BOUNDS(yy.size() == M());
for (size_type i=0; i<rows(); i++)
for (size_type j=0; j<cols(); j++)
yy[j] +=
--
GitLab
From 7d79fa84bc2b64ccecb7c0676809d10fc0e58f58 Mon Sep 17 00:00:00 2001
From: Timo Koch <timo.koch@iws.uni-stuttgart.de>
Date: Thu, 3 Apr 2025 08:32:23 +0000
Subject: [PATCH 2/2] [fmatrix][impl] Rename Impl::ColumnVectorView::N to
Impl::ColumnVectorView::size
Vector types don't have/need N() but we expect size().
---
dune/common/fmatrix.hh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dune/common/fmatrix.hh b/dune/common/fmatrix.hh
index 0ac53c715..5f4a77582 100644
--- a/dune/common/fmatrix.hh
+++ b/dune/common/fmatrix.hh
@@ -39,7 +39,7 @@ namespace Dune
col_(col)
{}
- constexpr size_type N () const {
+ constexpr size_type size () const {
return matrix_.N();
}
--
GitLab