Improve specializations of Hybrid::size()

The interfaces tested subsequently for Hybrid::size(const T& t) are now

• standard tuple-like interface std::tuple_size<T>::value (e.g. needed for std::tuple),
• static constexpr T::size() (e.g. needed for Dune::TupleVector),
• static constexpr T::N() (e.g. needed for Dune::MultiTypeBlockMatrix),
• dynamic member function t.N() (e.g. needed for Dune::Matrix),
• dynamic member function t.size() (e.g. needed for std::vector).

Unfortunately the matrix interface is rather inconsistent. While Dune::DenseMatrix provides a dyanmic size() method, the dynamic dense matrix Dune::Matrix does not. The only consistent interface to get the number of rows is the N() method which exists in dynamic (e.g. Dune::Matrix) and constexpr static (e.g. Dune::MultiTypeBlockMatrix) flavour. Hence to support matrices consistently, we must add support for those cases, too.

For the static constexpr N(), this was made neccessary, because of the removal of static consexpr Dune::MultiTypeBlockMatrix::size(). The dynamic case should be added for consistency to also support Dune::Matrix and Dune::BCRSMatrix. As a by-product, this allows to get rid of the FieldMatrix specialization.

Support for the N() cases was removed from the MR and left to future discussion. This MR now removes an obsolete special case for FieldVector, extends the test to cover this case, and fixes the documentation.

dune/common/test/hybridutilitiestest.cc

@@ -173,6 +173,7 @@ int main()
 {
   std::size_t one = 1; // run-time value
   auto vector = std::vector<int>{1, 2, 3};
+  auto fieldVector = Dune::FieldVector<double,3>({1, 2, 3});
   auto numberTuple = Dune::makeTupleVector(0.1, 2, 3);
 
   Dune::TestSuite test;
@@ -208,6 +209,10 @@ int main()
   test.check(numberTuple == Dune::makeTupleVector(1.1, 3, 4))
     << "Incrementing tuple entries with Hybrid::forEach failed.";
 
+  incrementAll(fieldVector);
+  test.check(fieldVector == Dune::FieldVector<double,3>({2, 3, 4}))
+    << "Incrementing FieldVector entries with Hybrid::forEach failed.";
+
   addIndex(vector);
   test.check(vector == std::vector<int>{2, 4, 6})
     << "Adding indices to vector entries with Hybrid::forEach failed.";
@@ -215,7 +220,14 @@ int main()
   addIndex(numberTuple);
   test.check(numberTuple == Dune::makeTupleVector(1.1, 4, 6))
     << "Adding indices to vector entries with Hybrid::forEach failed.";
-
+  test.check(Dune::IsIntegralConstant<decltype(Dune::Hybrid::size(numberTuple))>::value)
+    << "Hybrid::size() of std::tuple is not an std::integral_constant.";
+
+  addIndex(fieldVector);
+  test.check(fieldVector == Dune::FieldVector<double,3>({2, 4, 6}))
+    << "Adding indices to FieldVector entries with Hybrid::forEach failed.";
+  test.check(Dune::IsIntegralConstant<decltype(Dune::Hybrid::size(fieldVector))>::value)
+    << "Hybrid::size() of FieldVector is not an std::integral_constant.";
 
   auto mixedTuple = Dune::makeTupleVector(std::string("1"), 2, 3);
   incAndAppendToFirst(mixedTuple);