Skip to content
Snippets Groups Projects
Unverified Commit a6c205c8 authored by René Fritze's avatar René Fritze
Browse files

[tests.integrands] fix vector range ops

parent fc20ebd5
No related branches found
No related tags found
1 merge request!10Draft: consolidate refactoring work
......@@ -100,10 +100,10 @@ struct DivIntegrandTest : public IntegrandTest<G>
ansatz_div_op.assemble(true);
EXPECT_TRUE(XT::Common::FloatCmp::eq(test_div_mat, XT::Common::transposed(ansatz_div_mat), 1e-14, 1e-14));
const auto mat_data_ptr = XT::Common::serialize_rowwise(test_div_mat);
const auto min_entry = *std::min_element(mat_data_ptr.get(), mat_data_ptr.get() + n * m);
const auto max_entry = *std::max_element(mat_data_ptr.get(), mat_data_ptr.get() + n * m);
const auto min_entry = *std::min_element(mat_data_ptr.begin(), mat_data_ptr.begin() + n * m);
const auto max_entry = *std::max_element(mat_data_ptr.begin(), mat_data_ptr.begin() + n * m);
const auto square_sum = std::accumulate(
mat_data_ptr.get(), mat_data_ptr.get() + n * m, 0., [](const auto& a, const auto& b) { return a + b * b; });
mat_data_ptr.begin(), mat_data_ptr.begin() + n * m, 0., [](const auto& a, const auto& b) { return a + b * b; });
EXPECT_NEAR((is_simplex_grid_ ? -0.133333333333333 : -0.177777777777778), min_entry, 1e-13);
EXPECT_NEAR((is_simplex_grid_ ? 0.133333333333333 : 0.177777777777778), max_entry, 1e-13);
EXPECT_NEAR((is_simplex_grid_ ? 4.515925925925922 : 4.589465020576143), square_sum, 1e-13);
......
......@@ -153,10 +153,10 @@ struct GradientValueIntegrandTest : public IntegrandTest<G>
ansatz_grad_op.assemble(true);
EXPECT_TRUE(XT::Common::FloatCmp::eq(test_grad_mat, XT::Common::transposed(ansatz_grad_mat), 1e-14, 1e-14));
const auto mat_data_ptr = XT::Common::serialize_rowwise(test_grad_mat);
const auto min_entry = *std::min_element(mat_data_ptr.get(), mat_data_ptr.get() + n * n);
const auto max_entry = *std::max_element(mat_data_ptr.get(), mat_data_ptr.get() + n * n);
const auto min_entry = *std::min_element(mat_data_ptr.begin(), mat_data_ptr.begin() + n * n);
const auto max_entry = *std::max_element(mat_data_ptr.begin(), mat_data_ptr.begin() + n * n);
const auto square_sum = std::accumulate(
mat_data_ptr.get(), mat_data_ptr.get() + n * n, 0., [](const auto& a, const auto& b) { return a + b * b; });
mat_data_ptr.begin(), mat_data_ptr.begin() + n * n, 0., [](const auto& a, const auto& b) { return a + b * b; });
EXPECT_NEAR((is_simplex_grid_ ? -0.133333333333333 : -0.177777777777778), min_entry, 1e-13);
EXPECT_NEAR((is_simplex_grid_ ? 0.133333333333333 : 0.177777777777778), max_entry, 1e-13);
EXPECT_NEAR((is_simplex_grid_ ? 5.208148148148139 : 9.178930041152277), square_sum, 1e-13);
......
......@@ -124,10 +124,10 @@ struct LaplaceIntegrandTest : public IntegrandTest<G>
laplace_operator.append(LocalElementIntegralBilinearForm<E, 1>(integrand));
laplace_operator.assemble(true);
const auto mat_data_ptr = XT::Common::serialize_rowwise(stiffness_matrix);
const auto min_entry = *std::min_element(mat_data_ptr.get(), mat_data_ptr.get() + n * n);
const auto max_entry = *std::max_element(mat_data_ptr.get(), mat_data_ptr.get() + n * n);
const auto min_entry = *std::min_element(mat_data_ptr.begin(), mat_data_ptr.begin() + n * n);
const auto max_entry = *std::max_element(mat_data_ptr.begin(), mat_data_ptr.begin() + n * n);
const auto square_sum = std::accumulate(
mat_data_ptr.get(), mat_data_ptr.get() + n * n, 0., [](const auto& a, const auto& b) { return a + b * b; });
mat_data_ptr.begin(), mat_data_ptr.begin() + n * n, 0., [](const auto& a, const auto& b) { return a + b * b; });
EXPECT_NEAR((is_simplex_grid_ ? -2. : -1.896296296296300), min_entry, 1e-13);
EXPECT_NEAR((is_simplex_grid_ ? 5.777777777777780 : 6.162962962962970), max_entry, 1e-13);
EXPECT_NEAR((is_simplex_grid_ ? 2481.524691358029 : 1704.099039780521), square_sum, 5e-12);
......
......@@ -115,10 +115,10 @@ struct ProductIntegrandTest : public IntegrandTest<G>
product_operator.append(LocalElementIntegralBilinearForm<E, 1>(integrand));
product_operator.assemble(true);
const auto mat_data_ptr = XT::Common::serialize_rowwise(mass_matrix);
const auto min_entry = *std::min_element(mat_data_ptr.get(), mat_data_ptr.get() + n * n);
const auto max_entry = *std::max_element(mat_data_ptr.get(), mat_data_ptr.get() + n * n);
const auto min_entry = *std::min_element(mat_data_ptr.begin(), mat_data_ptr.begin() + n * n);
const auto max_entry = *std::max_element(mat_data_ptr.begin(), mat_data_ptr.begin() + n * n);
const auto square_sum = std::accumulate(
mat_data_ptr.get(), mat_data_ptr.get() + n * n, 0., [](const auto& a, const auto& b) { return a + b * b; });
mat_data_ptr.begin(), mat_data_ptr.begin() + n * n, 0., [](const auto& a, const auto& b) { return a + b * b; });
EXPECT_NEAR((is_simplex_grid_ ? -0.001851851851852 : -0.002962962962963), min_entry, 1e-13);
EXPECT_NEAR((is_simplex_grid_ ? 0.029629629629630 : 0.047407407407407), max_entry, 1e-13);
EXPECT_NEAR((is_simplex_grid_ ? 0.058804012345679 : 0.066475994513031), square_sum, 1e-13);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment