diff --git a/dune/stuff/test/common_configuration.cc b/dune/stuff/test/common_configuration.cc
index dab487c585bcc4103cf1ba48a198731ac14f9d8b..3a77a9dac3a5b933f0ba192cdfa689b1c43854bd 100644
--- a/dune/stuff/test/common_configuration.cc
+++ b/dune/stuff/test/common_configuration.cc
@@ -15,6 +15,8 @@
#include <dune/stuff/common/type_utils.hh>
#include <dune/stuff/common/float_cmp.hh>
#include <dune/stuff/la/container.hh>
+#include <dune/stuff/common/matrix.hh>
+#include <dune/stuff/common/tuple.hh>
#include <array>
#include <ostream>
@@ -183,6 +185,40 @@ struct ConfigTest : public testing::Test
}
}; // struct ConfigTest
+struct StaticCheck
+{
+ typedef boost::mpl::vector<Int<1>, Int<2>> Ints;
+
+ template <class MatrixType>
+ static void check_matrix_static_size(const Configuration& config)
+ {
+ typedef DSC::MatrixAbstraction<MatrixType> MT;
+ const auto r = MT::rows(MatrixType());
+ const auto c = MT::cols(MatrixType());
+
+ const auto check = [&r, &c](const MatrixType& mat) {
+ for (size_t cc = 0; cc < c; ++cc) {
+ for (size_t rr = 0; rr < r; ++rr) {
+ EXPECT_TRUE(FloatCmp::eq(MT::get_entry(mat, rr, cc), double(rr + cc)));
+ }
+ }
+ };
+
+ check(config.get("matrix", MatrixType(), r, c));
+ check(config.get("matrix", MatrixType()));
+ check(config.get<MatrixType>("matrix", r, c));
+ check(config.get<MatrixType>("matrix"));
+ }
+
+ template <class U, class V>
+ static void run(const DSC::Configuration& config)
+ {
+ const auto rows = U::value;
+ const auto cols = V::value;
+ check_matrix_static_size<Dune::Stuff::Common::FieldMatrix<double, rows, cols>>(config);
+ check_matrix_static_size<Dune::FieldMatrix<double, rows, cols>>(config);
+ }
+};
template <class ConfigurationCreator>
struct ConfigurationTest : public ::testing::Test
@@ -217,337 +253,74 @@ struct ConfigurationTest : public ::testing::Test
VectorType vec = config.get("vector", VectorType(), d);
EXPECT_EQ(d, vec.size());
for (size_t ii = 0; ii < d; ++ii)
- if (FloatCmp::ne(vec[ii], double(ii)))
- DUNE_THROW(results_are_not_as_expected,
- vec[ii] << " vs. " << ii << " with VectorType = " << Typename<VectorType>::value());
+ EXPECT_TRUE(FloatCmp::eq(vec[ii], double(ii)));
vec = config.get<VectorType>("vector", d);
- if (vec.size() != d)
- DUNE_THROW(results_are_not_as_expected,
- vec.size() << " vs. d with VectorType = " << Typename<VectorType>::value());
+ EXPECT_EQ(vec.size(), d);
+
for (size_t ii = 0; ii < d; ++ii)
- if (FloatCmp::ne(vec[ii], double(ii)))
- DUNE_THROW(results_are_not_as_expected,
- vec[ii] << " vs. " << ii << " with VectorType = " << Typename<VectorType>::value());
+ EXPECT_TRUE(FloatCmp::eq(vec[ii], double(ii)));
vec = config.get<VectorType>("vector");
- if (vec.size() != d)
- DUNE_THROW(results_are_not_as_expected,
- vec.size() << " vs. d with VectorType = " << Typename<VectorType>::value());
+ EXPECT_EQ(vec.size(), d);
+
for (size_t ii = 0; ii < d; ++ii)
- if (FloatCmp::ne(vec[ii], double(ii))) {
- DUNE_THROW(results_are_not_as_expected,
- vec[ii] << " vs. " << ii << " with VectorType = " << Typename<VectorType>::value());
- }
+ EXPECT_TRUE(FloatCmp::eq(vec[ii], double(ii)));
} // ... check_field_vector< ... >(...)
template <class MatrixType>
static void check_matrix(const Configuration& config)
{
MatrixType mat = config.get("matrix", MatrixType(), 1, 1);
- if (mat.rows() != 1 || mat.cols() != 1)
- DUNE_THROW(
- results_are_not_as_expected,
- mat.rows() << " vs. 1 and " << mat.cols() << "vs. 1 with MatrixType = " << Typename<MatrixType>::value());
- if (FloatCmp::ne(mat[0][0], 0.0))
- DUNE_THROW(results_are_not_as_expected,
- mat[0][0] << " vs. 0 with MatrixType = " << Typename<MatrixType>::value());
+ typedef DSC::MatrixAbstraction<MatrixType> MT;
+ EXPECT_FALSE(MT::rows(mat) != 1 || MT::cols(mat) != 1);
+ EXPECT_TRUE(FloatCmp::eq(MT::get_entry(mat, 0, 0), 0.0));
mat = config.get("matrix", MatrixType(), 1, 2);
- if (mat.rows() != 1 || mat.cols() != 2)
- DUNE_THROW(
- results_are_not_as_expected,
- mat.rows() << " vs. 1 and " << mat.cols() << "vs. 2 with MatrixType = " << Typename<MatrixType>::value());
- if (FloatCmp::ne(mat[0][0], 0.0))
- DUNE_THROW(results_are_not_as_expected,
- mat[0][0] << " vs. 0 with MatrixType = " << Typename<MatrixType>::value());
- if (FloatCmp::ne(mat[0][1], 1.0))
- DUNE_THROW(results_are_not_as_expected,
- mat[0][1] << " vs. 1 with MatrixType = " << Typename<MatrixType>::value());
+ EXPECT_FALSE(MT::rows(mat) != 1 || MT::cols(mat) != 2);
+ EXPECT_TRUE(FloatCmp::eq(MT::get_entry(mat, 0, 0), 0.0));
+ EXPECT_TRUE(FloatCmp::eq(MT::get_entry(mat, 0, 1), 1.0));
mat = config.get("matrix", MatrixType(), 2, 1);
- if (mat.rows() != 2 || mat.cols() != 1)
- DUNE_THROW(
- results_are_not_as_expected,
- mat.rows() << " vs. 2 and " << mat.cols() << "vs. 1 with MatrixType = " << Typename<MatrixType>::value());
- if (FloatCmp::ne(mat[0][0], 0.0))
- DUNE_THROW(results_are_not_as_expected,
- mat[0][0] << " vs. 0 with MatrixType = " << Typename<MatrixType>::value());
- if (FloatCmp::ne(mat[1][0], 1.0))
- DUNE_THROW(results_are_not_as_expected,
- mat[1][0] << " vs. 1 with MatrixType = " << Typename<MatrixType>::value());
+ EXPECT_FALSE(MT::rows(mat) != 2 || MT::cols(mat) != 1);
+ EXPECT_TRUE(FloatCmp::eq(MT::get_entry(mat, 0, 0), 0.0));
+ EXPECT_TRUE(FloatCmp::eq(MT::get_entry(mat, 1, 0), 1.0));
mat = config.get("matrix", MatrixType(), 2, 2);
- if (mat.rows() != 2 || mat.cols() != 2)
- DUNE_THROW(
- results_are_not_as_expected,
- mat.rows() << " vs. 2 and " << mat.cols() << "vs. 2 with MatrixType = " << Typename<MatrixType>::value());
- if (FloatCmp::ne(mat[0][0], 0.0))
- DUNE_THROW(results_are_not_as_expected,
- mat[0][0] << " vs. 0 with MatrixType = " << Typename<MatrixType>::value());
- if (FloatCmp::ne(mat[0][1], 1.0))
- DUNE_THROW(results_are_not_as_expected,
- mat[0][1] << " vs. 1 with MatrixType = " << Typename<MatrixType>::value());
- if (FloatCmp::ne(mat[1][0], 1.0))
- DUNE_THROW(results_are_not_as_expected,
- mat[1][0] << " vs. 1 with MatrixType = " << Typename<MatrixType>::value());
- if (FloatCmp::ne(mat[1][1], 2.0))
- DUNE_THROW(results_are_not_as_expected,
- mat[1][1] << " vs. 2 with MatrixType = " << Typename<MatrixType>::value());
+ EXPECT_FALSE(MT::rows(mat) != 2 || MT::cols(mat) != 2);
+ EXPECT_TRUE(FloatCmp::eq(MT::get_entry(mat, 0, 0), 0.0));
+ EXPECT_TRUE(FloatCmp::eq(MT::get_entry(mat, 0, 1), 1.0));
+ EXPECT_TRUE(FloatCmp::eq(MT::get_entry(mat, 1, 0), 1.0));
+ EXPECT_TRUE(FloatCmp::eq(MT::get_entry(mat, 1, 1), 2.0));
mat = config.get("matrix", MatrixType());
- if (mat.rows() != 2 || mat.cols() != 2)
- DUNE_THROW(
- results_are_not_as_expected,
- mat.rows() << " vs. 2 and " << mat.cols() << "vs. 2 with MatrixType = " << Typename<MatrixType>::value());
- if (FloatCmp::ne(mat[0][0], 0.0))
- DUNE_THROW(results_are_not_as_expected,
- mat[0][0] << " vs. 0 with MatrixType = " << Typename<MatrixType>::value());
- if (FloatCmp::ne(mat[0][1], 1.0))
- DUNE_THROW(results_are_not_as_expected,
- mat[0][1] << " vs. 1 with MatrixType = " << Typename<MatrixType>::value());
- if (FloatCmp::ne(mat[1][0], 1.0))
- DUNE_THROW(results_are_not_as_expected,
- mat[1][0] << " vs. 1 with MatrixType = " << Typename<MatrixType>::value());
- if (FloatCmp::ne(mat[1][1], 2.0))
- DUNE_THROW(results_are_not_as_expected,
- mat[1][1] << " vs. 2 with MatrixType = " << Typename<MatrixType>::value());
+ EXPECT_FALSE(MT::rows(mat) != 2 || MT::cols(mat) != 2);
+ EXPECT_TRUE(FloatCmp::eq(MT::get_entry(mat, 0, 0), 0.0));
+ EXPECT_TRUE(FloatCmp::eq(MT::get_entry(mat, 0, 1), 1.0));
+ EXPECT_TRUE(FloatCmp::eq(MT::get_entry(mat, 1, 0), 1.0));
+ EXPECT_TRUE(FloatCmp::eq(MT::get_entry(mat, 1, 1), 2.0));
mat = config.get<MatrixType>("matrix", 1, 1);
- if (mat.rows() != 1 || mat.cols() != 1)
- DUNE_THROW(
- results_are_not_as_expected,
- mat.rows() << " vs. 1 and " << mat.cols() << "vs. 1 with MatrixType = " << Typename<MatrixType>::value());
- if (FloatCmp::ne(mat[0][0], 0.0))
- DUNE_THROW(results_are_not_as_expected,
- mat[0][0] << " vs. 0 with MatrixType = " << Typename<MatrixType>::value());
+ EXPECT_FALSE(MT::rows(mat) != 1 || MT::cols(mat) != 1);
+ EXPECT_TRUE(FloatCmp::eq(MT::get_entry(mat, 0, 0), 0.0));
mat = config.get<MatrixType>("matrix", 1, 2);
- if (mat.rows() != 1 || mat.cols() != 2)
- DUNE_THROW(
- results_are_not_as_expected,
- mat.rows() << " vs. 1 and " << mat.cols() << "vs. 2 with MatrixType = " << Typename<MatrixType>::value());
- if (FloatCmp::ne(mat[0][0], 0.0))
- DUNE_THROW(results_are_not_as_expected,
- mat[0][0] << " vs. 0 with MatrixType = " << Typename<MatrixType>::value());
- if (FloatCmp::ne(mat[0][1], 1.0))
- DUNE_THROW(results_are_not_as_expected,
- mat[0][1] << " vs. 1 with MatrixType = " << Typename<MatrixType>::value());
+ EXPECT_FALSE(MT::rows(mat) != 1 || MT::cols(mat) != 2);
+ EXPECT_TRUE(FloatCmp::eq(MT::get_entry(mat, 0, 0), 0.0));
+ EXPECT_TRUE(FloatCmp::eq(MT::get_entry(mat, 0, 1), 1.0));
mat = config.get<MatrixType>("matrix", 2, 1);
- if (mat.rows() != 2 || mat.cols() != 1)
- DUNE_THROW(
- results_are_not_as_expected,
- mat.rows() << " vs. 2 and " << mat.cols() << "vs. 1 with MatrixType = " << Typename<MatrixType>::value());
- if (FloatCmp::ne(mat[0][0], 0.0))
- DUNE_THROW(results_are_not_as_expected,
- mat[0][0] << " vs. 0 with MatrixType = " << Typename<MatrixType>::value());
- if (FloatCmp::ne(mat[1][0], 1.0))
- DUNE_THROW(results_are_not_as_expected,
- mat[1][0] << " vs. 1 with MatrixType = " << Typename<MatrixType>::value());
+ EXPECT_FALSE(MT::rows(mat) != 2 || MT::cols(mat) != 1);
+ EXPECT_TRUE(FloatCmp::eq(MT::get_entry(mat, 0, 0), 0.0));
+ EXPECT_TRUE(FloatCmp::eq(MT::get_entry(mat, 1, 0), 1.0));
mat = config.get<MatrixType>("matrix", 2, 2);
- if (mat.rows() != 2 || mat.cols() != 2)
- DUNE_THROW(
- results_are_not_as_expected,
- mat.rows() << " vs. 2 and " << mat.cols() << "vs. 2 with MatrixType = " << Typename<MatrixType>::value());
- if (FloatCmp::ne(mat[0][0], 0.0))
- DUNE_THROW(results_are_not_as_expected,
- mat[0][0] << " vs. 0 with MatrixType = " << Typename<MatrixType>::value());
- if (FloatCmp::ne(mat[0][1], 1.0))
- DUNE_THROW(results_are_not_as_expected,
- mat[0][1] << " vs. 1 with MatrixType = " << Typename<MatrixType>::value());
- if (FloatCmp::ne(mat[1][0], 1.0))
- DUNE_THROW(results_are_not_as_expected,
- mat[1][0] << " vs. 1 with MatrixType = " << Typename<MatrixType>::value());
- if (FloatCmp::ne(mat[1][1], 2.0))
- DUNE_THROW(results_are_not_as_expected,
- mat[1][1] << " vs. 2 with MatrixType = " << Typename<MatrixType>::value());
+ EXPECT_FALSE(MT::rows(mat) != 2 || MT::cols(mat) != 2);
+ EXPECT_TRUE(FloatCmp::eq(MT::get_entry(mat, 0, 0), 0.0));
+ EXPECT_TRUE(FloatCmp::eq(MT::get_entry(mat, 0, 1), 1.0));
+ EXPECT_TRUE(FloatCmp::eq(MT::get_entry(mat, 1, 0), 1.0));
+ EXPECT_TRUE(FloatCmp::eq(MT::get_entry(mat, 1, 1), 2.0));
mat = config.get<MatrixType>("matrix");
- if (mat.rows() != 2 || mat.cols() != 2)
- DUNE_THROW(
- results_are_not_as_expected,
- mat.rows() << " vs. 2 and " << mat.cols() << "vs. 2 with MatrixType = " << Typename<MatrixType>::value());
- if (FloatCmp::ne(mat[0][0], 0.0))
- DUNE_THROW(results_are_not_as_expected,
- mat[0][0] << " vs. 0 with MatrixType = " << Typename<MatrixType>::value());
- if (FloatCmp::ne(mat[0][1], 1.0))
- DUNE_THROW(results_are_not_as_expected,
- mat[0][1] << " vs. 1 with MatrixType = " << Typename<MatrixType>::value());
- if (FloatCmp::ne(mat[1][0], 1.0))
- DUNE_THROW(results_are_not_as_expected,
- mat[1][0] << " vs. 1 with MatrixType = " << Typename<MatrixType>::value());
- if (FloatCmp::ne(mat[1][1], 2.0))
- DUNE_THROW(results_are_not_as_expected,
- mat[1][1] << " vs. 2 with MatrixType = " << Typename<MatrixType>::value());
+ EXPECT_FALSE(MT::rows(mat) != 2 || MT::cols(mat) != 2);
+ EXPECT_TRUE(FloatCmp::eq(MT::get_entry(mat, 0, 0), 0.0));
+ EXPECT_TRUE(FloatCmp::eq(MT::get_entry(mat, 0, 1), 1.0));
+ EXPECT_TRUE(FloatCmp::eq(MT::get_entry(mat, 1, 0), 1.0));
+ EXPECT_TRUE(FloatCmp::eq(MT::get_entry(mat, 1, 1), 2.0));
} // ... check_matrix< ... >(...)
- template <class MatrixType>
- static void check_stuff_matrix(const Configuration& config)
- {
- MatrixType mat = config.get("matrix", MatrixType(), 1, 1);
- if (mat.rows() != 1 || mat.cols() != 1)
- DUNE_THROW(
- results_are_not_as_expected,
- mat.rows() << " vs. 1 and " << mat.cols() << "vs. 1 with MatrixType = " << Typename<MatrixType>::value());
- if (FloatCmp::ne(mat.get_entry(0, 0), 0.0))
- DUNE_THROW(results_are_not_as_expected,
- mat.get_entry(0, 0) << " vs. 0 with MatrixType = " << Typename<MatrixType>::value());
- mat = config.get("matrix", MatrixType(), 1, 2);
- if (mat.rows() != 1 || mat.cols() != 2)
- DUNE_THROW(
- results_are_not_as_expected,
- mat.rows() << " vs. 1 and " << mat.cols() << "vs. 2 with MatrixType = " << Typename<MatrixType>::value());
- if (FloatCmp::ne(mat.get_entry(0, 0), 0.0))
- DUNE_THROW(results_are_not_as_expected,
- mat.get_entry(0, 0) << " vs. 0 with MatrixType = " << Typename<MatrixType>::value());
- if (FloatCmp::ne(mat.get_entry(0, 1), 1.0))
- DUNE_THROW(results_are_not_as_expected,
- mat.get_entry(0, 1) << " vs. 1 with MatrixType = " << Typename<MatrixType>::value());
- mat = config.get("matrix", MatrixType(), 2, 1);
- if (mat.rows() != 2 || mat.cols() != 1)
- DUNE_THROW(
- results_are_not_as_expected,
- mat.rows() << " vs. 2 and " << mat.cols() << "vs. 1 with MatrixType = " << Typename<MatrixType>::value());
- if (FloatCmp::ne(mat.get_entry(0, 0), 0.0))
- DUNE_THROW(results_are_not_as_expected,
- mat.get_entry(0, 0) << " vs. 0 with MatrixType = " << Typename<MatrixType>::value());
- if (FloatCmp::ne(mat.get_entry(1, 0), 1.0))
- DUNE_THROW(results_are_not_as_expected,
- mat.get_entry(1, 0) << " vs. 1 with MatrixType = " << Typename<MatrixType>::value());
- mat = config.get("matrix", MatrixType(), 2, 2);
- if (mat.rows() != 2 || mat.cols() != 2)
- DUNE_THROW(
- results_are_not_as_expected,
- mat.rows() << " vs. 2 and " << mat.cols() << "vs. 2 with MatrixType = " << Typename<MatrixType>::value());
- if (FloatCmp::ne(mat.get_entry(0, 0), 0.0))
- DUNE_THROW(results_are_not_as_expected,
- mat.get_entry(0, 0) << " vs. 0 with MatrixType = " << Typename<MatrixType>::value());
- if (FloatCmp::ne(mat.get_entry(0, 1), 1.0))
- DUNE_THROW(results_are_not_as_expected,
- mat.get_entry(0, 1) << " vs. 1 with MatrixType = " << Typename<MatrixType>::value());
- if (FloatCmp::ne(mat.get_entry(1, 0), 1.0))
- DUNE_THROW(results_are_not_as_expected,
- mat.get_entry(1, 0) << " vs. 1 with MatrixType = " << Typename<MatrixType>::value());
- if (FloatCmp::ne(mat.get_entry(1, 1), 2.0))
- DUNE_THROW(results_are_not_as_expected,
- mat.get_entry(1, 1) << " vs. 2 with MatrixType = " << Typename<MatrixType>::value());
- mat = config.get("matrix", MatrixType());
- if (mat.rows() != 2 || mat.cols() != 2)
- DUNE_THROW(
- results_are_not_as_expected,
- mat.rows() << " vs. 2 and " << mat.cols() << "vs. 2 with MatrixType = " << Typename<MatrixType>::value());
- if (FloatCmp::ne(mat.get_entry(0, 0), 0.0))
- DUNE_THROW(results_are_not_as_expected,
- mat.get_entry(0, 0) << " vs. 0 with MatrixType = " << Typename<MatrixType>::value());
- if (FloatCmp::ne(mat.get_entry(0, 1), 1.0))
- DUNE_THROW(results_are_not_as_expected,
- mat.get_entry(0, 1) << " vs. 1 with MatrixType = " << Typename<MatrixType>::value());
- if (FloatCmp::ne(mat.get_entry(1, 0), 1.0))
- DUNE_THROW(results_are_not_as_expected,
- mat.get_entry(1, 0) << " vs. 1 with MatrixType = " << Typename<MatrixType>::value());
- if (FloatCmp::ne(mat.get_entry(1, 1), 2.0))
- DUNE_THROW(results_are_not_as_expected,
- mat.get_entry(1, 1) << " vs. 2 with MatrixType = " << Typename<MatrixType>::value());
-
- mat = config.get<MatrixType>("matrix", 1, 1);
- if (mat.rows() != 1 || mat.cols() != 1)
- DUNE_THROW(
- results_are_not_as_expected,
- mat.rows() << " vs. 1 and " << mat.cols() << "vs. 1 with MatrixType = " << Typename<MatrixType>::value());
- if (FloatCmp::ne(mat.get_entry(0, 0), 0.0))
- DUNE_THROW(results_are_not_as_expected,
- mat.get_entry(0, 0) << " vs. 0 with MatrixType = " << Typename<MatrixType>::value());
- mat = config.get<MatrixType>("matrix", 1, 2);
- if (mat.rows() != 1 || mat.cols() != 2)
- DUNE_THROW(
- results_are_not_as_expected,
- mat.rows() << " vs. 1 and " << mat.cols() << "vs. 2 with MatrixType = " << Typename<MatrixType>::value());
- if (FloatCmp::ne(mat.get_entry(0, 0), 0.0))
- DUNE_THROW(results_are_not_as_expected,
- mat.get_entry(0, 0) << " vs. 0 with MatrixType = " << Typename<MatrixType>::value());
- if (FloatCmp::ne(mat.get_entry(0, 1), 1.0))
- DUNE_THROW(results_are_not_as_expected,
- mat.get_entry(0, 1) << " vs. 1 with MatrixType = " << Typename<MatrixType>::value());
- mat = config.get<MatrixType>("matrix", 2, 1);
- if (mat.rows() != 2 || mat.cols() != 1)
- DUNE_THROW(
- results_are_not_as_expected,
- mat.rows() << " vs. 2 and " << mat.cols() << "vs. 1 with MatrixType = " << Typename<MatrixType>::value());
- if (FloatCmp::ne(mat.get_entry(0, 0), 0.0))
- DUNE_THROW(results_are_not_as_expected,
- mat.get_entry(0, 0) << " vs. 0 with MatrixType = " << Typename<MatrixType>::value());
- if (FloatCmp::ne(mat.get_entry(1, 0), 1.0))
- DUNE_THROW(results_are_not_as_expected,
- mat.get_entry(1, 0) << " vs. 1 with MatrixType = " << Typename<MatrixType>::value());
- mat = config.get<MatrixType>("matrix", 2, 2);
- if (mat.rows() != 2 || mat.cols() != 2)
- DUNE_THROW(
- results_are_not_as_expected,
- mat.rows() << " vs. 2 and " << mat.cols() << "vs. 2 with MatrixType = " << Typename<MatrixType>::value());
- if (FloatCmp::ne(mat.get_entry(0, 0), 0.0))
- DUNE_THROW(results_are_not_as_expected,
- mat.get_entry(0, 0) << " vs. 0 with MatrixType = " << Typename<MatrixType>::value());
- if (FloatCmp::ne(mat.get_entry(0, 1), 1.0))
- DUNE_THROW(results_are_not_as_expected,
- mat.get_entry(0, 1) << " vs. 1 with MatrixType = " << Typename<MatrixType>::value());
- if (FloatCmp::ne(mat.get_entry(1, 0), 1.0))
- DUNE_THROW(results_are_not_as_expected,
- mat.get_entry(1, 0) << " vs. 1 with MatrixType = " << Typename<MatrixType>::value());
- if (FloatCmp::ne(mat.get_entry(1, 1), 2.0))
- DUNE_THROW(results_are_not_as_expected,
- mat.get_entry(1, 1) << " vs. 2 with MatrixType = " << Typename<MatrixType>::value());
- mat = config.get<MatrixType>("matrix");
- if (mat.rows() != 2 || mat.cols() != 2)
- DUNE_THROW(
- results_are_not_as_expected,
- mat.rows() << " vs. 2 and " << mat.cols() << "vs. 2 with MatrixType = " << Typename<MatrixType>::value());
- if (FloatCmp::ne(mat.get_entry(0, 0), 0.0))
- DUNE_THROW(results_are_not_as_expected,
- mat.get_entry(0, 0) << " vs. 0 with MatrixType = " << Typename<MatrixType>::value());
- if (FloatCmp::ne(mat.get_entry(0, 1), 1.0))
- DUNE_THROW(results_are_not_as_expected,
- mat.get_entry(0, 1) << " vs. 1 with MatrixType = " << Typename<MatrixType>::value());
- if (FloatCmp::ne(mat.get_entry(1, 0), 1.0))
- DUNE_THROW(results_are_not_as_expected,
- mat.get_entry(1, 0) << " vs. 1 with MatrixType = " << Typename<MatrixType>::value());
- if (FloatCmp::ne(mat.get_entry(1, 1), 2.0))
- DUNE_THROW(results_are_not_as_expected,
- mat.get_entry(1, 1) << " vs. 2 with MatrixType = " << Typename<MatrixType>::value());
- } // ... check_stuff_matrix< ... >(...)
-
- template <class K, int r, int c>
- static void check_field_matrix(const Configuration& config)
- {
- typedef FieldMatrix<K, r, c> MatrixType;
- MatrixType mat = config.get("matrix", MatrixType(), r, c);
- for (size_t cc = 0; cc < c; ++cc) {
- for (size_t rr = 0; rr < r; ++rr) {
- if (FloatCmp::ne(mat[rr][cc], double(rr + cc)))
- DUNE_THROW(results_are_not_as_expected,
- mat[rr][cc] << " vs. " << rr + cc << " with MatrixType = " << Typename<MatrixType>::value());
- }
- }
- mat = config.get("matrix", MatrixType());
- for (size_t cc = 0; cc < c; ++cc) {
- for (size_t rr = 0; rr < r; ++rr) {
- if (FloatCmp::ne(mat[rr][cc], double(rr + cc)))
- DUNE_THROW(results_are_not_as_expected,
- mat[rr][cc] << " vs. " << rr + cc << " with MatrixType = " << Typename<MatrixType>::value());
- }
- }
-
- mat = config.get<MatrixType>("matrix", r, c);
- for (size_t cc = 0; cc < c; ++cc) {
- for (size_t rr = 0; rr < r; ++rr) {
- if (FloatCmp::ne(mat[rr][cc], double(rr + cc)))
- DUNE_THROW(results_are_not_as_expected,
- mat[rr][cc] << " vs. " << rr + cc << " with MatrixType = " << Typename<MatrixType>::value());
- }
- }
- mat = config.get<MatrixType>("matrix");
- for (size_t cc = 0; cc < c; ++cc) {
- for (size_t rr = 0; rr < r; ++rr) {
- if (FloatCmp::ne(mat[rr][cc], double(rr + cc)))
- DUNE_THROW(results_are_not_as_expected,
- mat[rr][cc] << " vs. " << rr + cc << " with MatrixType = " << Typename<MatrixType>::value());
- }
- }
- } // ... check_field_matrix< ... >(...)
-
static void behaves_correctly()
{
const Configuration config = ConfigurationCreator::create();
@@ -557,53 +330,46 @@ struct ConfigurationTest : public ::testing::Test
test_out << config << std::endl;
std::string DUNE_UNUSED(report_str) = config.report_string();
std::string str = config.get("string", std::string("foo"));
- if (str != "string")
- DUNE_THROW(results_are_not_as_expected, "'" << str << "'' vs. 'string'");
+ EXPECT_EQ(str, "string");
str = config.get("foo", std::string("string"));
- if (str != "string")
- DUNE_THROW(results_are_not_as_expected, "'" << str << "'' vs. 'string'");
+ EXPECT_EQ(str, "string");
str = config.get<std::string>("string");
- if (str != "string")
- DUNE_THROW(results_are_not_as_expected, "'" << str << "'' vs. 'string'");
+ EXPECT_EQ(str, "string");
- if (!config.has_sub("sub1"))
- DUNE_THROW(results_are_not_as_expected, "Sub 'sub1' does not exists in this config:\n" << config);
+ EXPECT_TRUE(config.has_sub("sub1"));
Configuration sub1_config = config.sub("sub1");
int nt = sub1_config.get("int", int(0));
- if (nt != 1)
- DUNE_THROW(results_are_not_as_expected, "'" << nt << "'' vs. '1'");
+ EXPECT_EQ(nt, 1);
nt = sub1_config.get("intt", int(1));
- if (nt != 1)
- DUNE_THROW(results_are_not_as_expected, "'" << nt << "'' vs. '1'");
+ EXPECT_EQ(nt, 1);
nt = sub1_config.get<int>("int");
- if (nt != 1)
- DUNE_THROW(results_are_not_as_expected, "'" << nt << "'' vs. '1'");
+ EXPECT_EQ(nt, 1);
size_t st = config.get("sub2.size_t", size_t(0));
- if (st != 1)
- DUNE_THROW(results_are_not_as_expected, "'" << st << "'' vs. '1'");
+ EXPECT_EQ(st, 1);
st = config.get("sub2.size_tt", size_t(1));
- if (st != 1)
- DUNE_THROW(results_are_not_as_expected, "'" << st << "'' vs. '1'");
+ EXPECT_EQ(st, 1);
st = config.get<size_t>("sub2.size_t");
- if (st != 1)
- DUNE_THROW(results_are_not_as_expected, "'" << st << "'' vs. '1'");
-
- check_vector<std::vector<double>>(config.sub("sub2.subsub1"));
- check_field_vector<double, 1>(config.sub("sub2.subsub1"));
- check_field_vector<double, 2>(config.sub("sub2.subsub1"));
- check_vector<Dune::DynamicVector<double>>(config.sub("sub2.subsub1"));
- check_vector<Dune::Stuff::LA::CommonDenseVector<double>>(config.sub("sub2.subsub1"));
+ EXPECT_EQ(st, 1);
+
+ const auto subsub1 = config.sub("sub2.subsub1");
+ check_vector<std::vector<double>>(subsub1);
+ check_field_vector<double, 1>(subsub1);
+ check_field_vector<double, 2>(subsub1);
+ check_vector<Dune::DynamicVector<double>>(subsub1);
+ check_vector<Dune::Stuff::LA::CommonDenseVector<double>>(subsub1);
#if HAVE_DUNE_ISTL
- check_vector<Dune::Stuff::LA::IstlDenseVector<double>>(config.sub("sub2.subsub1"));
+ check_vector<Dune::Stuff::LA::IstlDenseVector<double>>(subsub1);
#endif
#if HAVE_EIGEN
- check_vector<Dune::Stuff::LA::EigenDenseVector<double>>(config.sub("sub2.subsub1"));
- check_vector<Dune::Stuff::LA::EigenMappedDenseVector<double>>(config.sub("sub2.subsub1"));
- check_stuff_matrix<Dune::Stuff::LA::EigenDenseMatrix<double>>(config.sub("sub2.subsub1"));
+ check_vector<Dune::Stuff::LA::EigenDenseVector<double>>(subsub1);
+ check_vector<Dune::Stuff::LA::EigenMappedDenseVector<double>>(subsub1);
+ check_matrix<Dune::Stuff::LA::EigenDenseMatrix<double>>(subsub1);
#endif // HAVE_EIGEN
- check_field_matrix<double, 2, 2>(config.sub("sub2.subsub1"));
- check_matrix<Dune::DynamicMatrix<double>>(config.sub("sub2.subsub1"));
- check_stuff_matrix<Dune::Stuff::LA::CommonDenseMatrix<double>>(config.sub("sub2.subsub1"));
+ check_matrix<Dune::DynamicMatrix<double>>(subsub1);
+ check_matrix<Dune::Stuff::LA::CommonDenseMatrix<double>>(subsub1);
+
+ DSC::TupleProduct::Combine<StaticCheck::Ints, StaticCheck::Ints, StaticCheck>::Generate<>::Run(subsub1);
+
} // ... behaves_correctly(...)
}; // struct ConfigurationTest