Skip to content
Snippets Groups Projects
Commit d1514df1 authored by Stéphane Del Pino's avatar Stéphane Del Pino
Browse files

Rename same_cell_value -> same_item_value

parent 7064b40e
No related branches found
No related tags found
1 merge request!128Feature/unit tests
......@@ -28,7 +28,7 @@ TEST_CASE("InterpolateItemValue", "[language]")
{
SECTION("interpolate on all items")
{
auto same_cell_value = [](auto f, auto g) -> bool {
auto same_item_value = [](auto f, auto g) -> bool {
using ItemIdType = typename decltype(f)::index_type;
for (ItemIdType item_id = 0; item_id < f.numberOfItems(); ++item_id) {
if (f[item_id] != g[item_id]) {
......@@ -98,7 +98,7 @@ let R2x2_non_linear_1d: R^1 -> R^2x2, x -> (2 * exp(x[0]) * sin(x[0]) + 3, sin(x
CellValue<const double> interpolate_value =
InterpolateItemValue<double(TinyVector<Dimension>)>::interpolate(function_symbol_id, xj);
REQUIRE(same_cell_value(cell_value, interpolate_value));
REQUIRE(same_item_value(cell_value, interpolate_value));
}
SECTION("scalar_non_linear_1d")
......@@ -119,7 +119,7 @@ let R2x2_non_linear_1d: R^1 -> R^2x2, x -> (2 * exp(x[0]) * sin(x[0]) + 3, sin(x
CellValue<const double> interpolate_value =
InterpolateItemValue<double(TinyVector<Dimension>)>::interpolate(function_symbol_id, xj);
REQUIRE(same_cell_value(cell_value, interpolate_value));
REQUIRE(same_item_value(cell_value, interpolate_value));
}
SECTION("R3_affine_1d")
......@@ -140,7 +140,7 @@ let R2x2_non_linear_1d: R^1 -> R^2x2, x -> (2 * exp(x[0]) * sin(x[0]) + 3, sin(x
CellValue<const TinyVector<3>> interpolate_value =
InterpolateItemValue<TinyVector<3>(TinyVector<Dimension>)>::interpolate(function_symbol_id, xj);
REQUIRE(same_cell_value(cell_value, interpolate_value));
REQUIRE(same_item_value(cell_value, interpolate_value));
}
SECTION("R3_non_linear_1d")
......@@ -161,7 +161,7 @@ let R2x2_non_linear_1d: R^1 -> R^2x2, x -> (2 * exp(x[0]) * sin(x[0]) + 3, sin(x
CellValue<const TinyVector<3>> interpolate_value =
InterpolateItemValue<TinyVector<3>(TinyVector<Dimension>)>::interpolate(function_symbol_id, xj);
REQUIRE(same_cell_value(cell_value, interpolate_value));
REQUIRE(same_item_value(cell_value, interpolate_value));
}
SECTION("R2x2_affine_1d")
......@@ -182,7 +182,7 @@ let R2x2_non_linear_1d: R^1 -> R^2x2, x -> (2 * exp(x[0]) * sin(x[0]) + 3, sin(x
CellValue<const TinyMatrix<2>> interpolate_value =
InterpolateItemValue<TinyMatrix<2>(TinyVector<Dimension>)>::interpolate(function_symbol_id, xj);
REQUIRE(same_cell_value(cell_value, interpolate_value));
REQUIRE(same_item_value(cell_value, interpolate_value));
}
SECTION("R2x2_non_linear_1d")
......@@ -204,7 +204,7 @@ let R2x2_non_linear_1d: R^1 -> R^2x2, x -> (2 * exp(x[0]) * sin(x[0]) + 3, sin(x
CellValue<const TinyMatrix<2>> interpolate_value =
InterpolateItemValue<TinyMatrix<2>(TinyVector<Dimension>)>::interpolate(function_symbol_id, xj);
REQUIRE(same_cell_value(cell_value, interpolate_value));
REQUIRE(same_item_value(cell_value, interpolate_value));
}
}
}
......@@ -268,7 +268,7 @@ let R2x2_non_linear_2d: R^2 -> R^2x2, x -> (2*exp(x[0])*sin(x[1])+3, sin(x[0]-2*
CellValue<const double> interpolate_value =
InterpolateItemValue<double(TinyVector<Dimension>)>::interpolate(function_symbol_id, xj);
REQUIRE(same_cell_value(cell_value, interpolate_value));
REQUIRE(same_item_value(cell_value, interpolate_value));
}
SECTION("scalar_non_linear_2d")
......@@ -288,7 +288,7 @@ let R2x2_non_linear_2d: R^2 -> R^2x2, x -> (2*exp(x[0])*sin(x[1])+3, sin(x[0]-2*
CellValue<const double> interpolate_value =
InterpolateItemValue<double(TinyVector<Dimension>)>::interpolate(function_symbol_id, xj);
REQUIRE(same_cell_value(cell_value, interpolate_value));
REQUIRE(same_item_value(cell_value, interpolate_value));
}
SECTION("R3_affine_2d")
......@@ -308,7 +308,7 @@ let R2x2_non_linear_2d: R^2 -> R^2x2, x -> (2*exp(x[0])*sin(x[1])+3, sin(x[0]-2*
CellValue<const TinyVector<3>> interpolate_value =
InterpolateItemValue<TinyVector<3>(TinyVector<Dimension>)>::interpolate(function_symbol_id, xj);
REQUIRE(same_cell_value(cell_value, interpolate_value));
REQUIRE(same_item_value(cell_value, interpolate_value));
}
SECTION("R3_non_linear_2d")
......@@ -328,7 +328,7 @@ let R2x2_non_linear_2d: R^2 -> R^2x2, x -> (2*exp(x[0])*sin(x[1])+3, sin(x[0]-2*
CellValue<const TinyVector<3>> interpolate_value =
InterpolateItemValue<TinyVector<3>(TinyVector<Dimension>)>::interpolate(function_symbol_id, xj);
REQUIRE(same_cell_value(cell_value, interpolate_value));
REQUIRE(same_item_value(cell_value, interpolate_value));
}
SECTION("R2x2_affine_2d")
......@@ -348,7 +348,7 @@ let R2x2_non_linear_2d: R^2 -> R^2x2, x -> (2*exp(x[0])*sin(x[1])+3, sin(x[0]-2*
CellValue<const TinyMatrix<2>> interpolate_value =
InterpolateItemValue<TinyMatrix<2>(TinyVector<Dimension>)>::interpolate(function_symbol_id, xj);
REQUIRE(same_cell_value(cell_value, interpolate_value));
REQUIRE(same_item_value(cell_value, interpolate_value));
}
SECTION("R2x2_non_linear_2d")
......@@ -369,7 +369,7 @@ let R2x2_non_linear_2d: R^2 -> R^2x2, x -> (2*exp(x[0])*sin(x[1])+3, sin(x[0]-2*
CellValue<const TinyMatrix<2>> interpolate_value =
InterpolateItemValue<TinyMatrix<2>(TinyVector<Dimension>)>::interpolate(function_symbol_id, xj);
REQUIRE(same_cell_value(cell_value, interpolate_value));
REQUIRE(same_item_value(cell_value, interpolate_value));
}
}
}
......@@ -433,7 +433,7 @@ let R2x2_non_linear_3d: R^3 -> R^2x2, x -> (2 * exp(x[0]) * sin(x[1]) + 3 * cos(
CellValue<const double> interpolate_value =
InterpolateItemValue<double(TinyVector<Dimension>)>::interpolate(function_symbol_id, xj);
REQUIRE(same_cell_value(cell_value, interpolate_value));
REQUIRE(same_item_value(cell_value, interpolate_value));
}
SECTION("scalar_non_linear_3d")
......@@ -453,7 +453,7 @@ let R2x2_non_linear_3d: R^3 -> R^2x2, x -> (2 * exp(x[0]) * sin(x[1]) + 3 * cos(
CellValue<const double> interpolate_value =
InterpolateItemValue<double(TinyVector<Dimension>)>::interpolate(function_symbol_id, xj);
REQUIRE(same_cell_value(cell_value, interpolate_value));
REQUIRE(same_item_value(cell_value, interpolate_value));
}
SECTION("R3_affine_3d")
......@@ -473,7 +473,7 @@ let R2x2_non_linear_3d: R^3 -> R^2x2, x -> (2 * exp(x[0]) * sin(x[1]) + 3 * cos(
CellValue<const TinyVector<3>> interpolate_value =
InterpolateItemValue<TinyVector<3>(TinyVector<Dimension>)>::interpolate(function_symbol_id, xj);
REQUIRE(same_cell_value(cell_value, interpolate_value));
REQUIRE(same_item_value(cell_value, interpolate_value));
}
SECTION("R3_non_linear_3d")
......@@ -493,7 +493,7 @@ let R2x2_non_linear_3d: R^3 -> R^2x2, x -> (2 * exp(x[0]) * sin(x[1]) + 3 * cos(
CellValue<const TinyVector<3>> interpolate_value =
InterpolateItemValue<TinyVector<3>(TinyVector<Dimension>)>::interpolate(function_symbol_id, xj);
REQUIRE(same_cell_value(cell_value, interpolate_value));
REQUIRE(same_item_value(cell_value, interpolate_value));
}
SECTION("R2x2_affine_3d")
......@@ -514,7 +514,7 @@ let R2x2_non_linear_3d: R^3 -> R^2x2, x -> (2 * exp(x[0]) * sin(x[1]) + 3 * cos(
CellValue<const TinyMatrix<2>> interpolate_value =
InterpolateItemValue<TinyMatrix<2>(TinyVector<Dimension>)>::interpolate(function_symbol_id, xj);
REQUIRE(same_cell_value(cell_value, interpolate_value));
REQUIRE(same_item_value(cell_value, interpolate_value));
}
SECTION("R2x2_non_linear_3d")
......@@ -535,16 +535,16 @@ let R2x2_non_linear_3d: R^3 -> R^2x2, x -> (2 * exp(x[0]) * sin(x[1]) + 3 * cos(
CellValue<const TinyMatrix<2>> interpolate_value =
InterpolateItemValue<TinyMatrix<2>(TinyVector<Dimension>)>::interpolate(function_symbol_id, xj);
REQUIRE(same_cell_value(cell_value, interpolate_value));
REQUIRE(same_item_value(cell_value, interpolate_value));
}
}
}
}
}
SECTION("interpolate on items list")
SECTION("interpolate on item list")
{
auto same_cell_value = [](auto interpolated, auto reference) -> bool {
auto same_item_value = [](auto interpolated, auto reference) -> bool {
for (size_t i = 0; i < interpolated.size(); ++i) {
if (interpolated[i] != reference[i]) {
return false;
......@@ -621,7 +621,7 @@ let R2x2_non_linear_1d: R^1 -> R^2x2, x -> (2 * exp(x[0]) * sin(x[0]) + 3, sin(x
Array<const double> interpolate_value =
InterpolateItemValue<double(TinyVector<Dimension>)>::interpolate(function_symbol_id, xj, cell_id_list);
REQUIRE(same_cell_value(cell_value, interpolate_value));
REQUIRE(same_item_value(cell_value, interpolate_value));
}
SECTION("scalar_non_linear_1d")
......@@ -642,7 +642,7 @@ let R2x2_non_linear_1d: R^1 -> R^2x2, x -> (2 * exp(x[0]) * sin(x[0]) + 3, sin(x
Array<const double> interpolate_value =
InterpolateItemValue<double(TinyVector<Dimension>)>::interpolate(function_symbol_id, xj, cell_id_list);
REQUIRE(same_cell_value(cell_value, interpolate_value));
REQUIRE(same_item_value(cell_value, interpolate_value));
}
SECTION("R3_affine_1d")
......@@ -664,7 +664,7 @@ let R2x2_non_linear_1d: R^1 -> R^2x2, x -> (2 * exp(x[0]) * sin(x[0]) + 3, sin(x
InterpolateItemValue<TinyVector<3>(TinyVector<Dimension>)>::interpolate(function_symbol_id, xj,
cell_id_list);
REQUIRE(same_cell_value(cell_value, interpolate_value));
REQUIRE(same_item_value(cell_value, interpolate_value));
}
SECTION("R3_non_linear_1d")
......@@ -686,7 +686,7 @@ let R2x2_non_linear_1d: R^1 -> R^2x2, x -> (2 * exp(x[0]) * sin(x[0]) + 3, sin(x
InterpolateItemValue<TinyVector<3>(TinyVector<Dimension>)>::interpolate(function_symbol_id, xj,
cell_id_list);
REQUIRE(same_cell_value(cell_value, interpolate_value));
REQUIRE(same_item_value(cell_value, interpolate_value));
}
SECTION("R2x2_affine_1d")
......@@ -708,7 +708,7 @@ let R2x2_non_linear_1d: R^1 -> R^2x2, x -> (2 * exp(x[0]) * sin(x[0]) + 3, sin(x
InterpolateItemValue<TinyMatrix<2>(TinyVector<Dimension>)>::interpolate(function_symbol_id, xj,
cell_id_list);
REQUIRE(same_cell_value(cell_value, interpolate_value));
REQUIRE(same_item_value(cell_value, interpolate_value));
}
SECTION("R2x2_non_linear_1d")
......@@ -730,7 +730,7 @@ let R2x2_non_linear_1d: R^1 -> R^2x2, x -> (2 * exp(x[0]) * sin(x[0]) + 3, sin(x
InterpolateItemValue<TinyMatrix<2>(TinyVector<Dimension>)>::interpolate(function_symbol_id, xj,
cell_id_list);
REQUIRE(same_cell_value(cell_value, interpolate_value));
REQUIRE(same_item_value(cell_value, interpolate_value));
}
}
}
......@@ -800,7 +800,7 @@ let R2x2_non_linear_2d: R^2 -> R^2x2, x -> (2*exp(x[0])*sin(x[1])+3, sin(x[0]-2*
Array<const double> interpolate_value =
InterpolateItemValue<double(TinyVector<Dimension>)>::interpolate(function_symbol_id, xj, cell_id_list);
REQUIRE(same_cell_value(cell_value, interpolate_value));
REQUIRE(same_item_value(cell_value, interpolate_value));
}
SECTION("scalar_non_linear_2d")
......@@ -820,7 +820,7 @@ let R2x2_non_linear_2d: R^2 -> R^2x2, x -> (2*exp(x[0])*sin(x[1])+3, sin(x[0]-2*
Array<const double> interpolate_value =
InterpolateItemValue<double(TinyVector<Dimension>)>::interpolate(function_symbol_id, xj, cell_id_list);
REQUIRE(same_cell_value(cell_value, interpolate_value));
REQUIRE(same_item_value(cell_value, interpolate_value));
}
SECTION("R3_affine_2d")
......@@ -841,7 +841,7 @@ let R2x2_non_linear_2d: R^2 -> R^2x2, x -> (2*exp(x[0])*sin(x[1])+3, sin(x[0]-2*
InterpolateItemValue<TinyVector<3>(TinyVector<Dimension>)>::interpolate(function_symbol_id, xj,
cell_id_list);
REQUIRE(same_cell_value(cell_value, interpolate_value));
REQUIRE(same_item_value(cell_value, interpolate_value));
}
SECTION("R3_non_linear_2d")
......@@ -862,7 +862,7 @@ let R2x2_non_linear_2d: R^2 -> R^2x2, x -> (2*exp(x[0])*sin(x[1])+3, sin(x[0]-2*
InterpolateItemValue<TinyVector<3>(TinyVector<Dimension>)>::interpolate(function_symbol_id, xj,
cell_id_list);
REQUIRE(same_cell_value(cell_value, interpolate_value));
REQUIRE(same_item_value(cell_value, interpolate_value));
}
SECTION("R2x2_affine_2d")
......@@ -883,7 +883,7 @@ let R2x2_non_linear_2d: R^2 -> R^2x2, x -> (2*exp(x[0])*sin(x[1])+3, sin(x[0]-2*
InterpolateItemValue<TinyMatrix<2>(TinyVector<Dimension>)>::interpolate(function_symbol_id, xj,
cell_id_list);
REQUIRE(same_cell_value(cell_value, interpolate_value));
REQUIRE(same_item_value(cell_value, interpolate_value));
}
SECTION("R2x2_non_linear_2d")
......@@ -904,7 +904,7 @@ let R2x2_non_linear_2d: R^2 -> R^2x2, x -> (2*exp(x[0])*sin(x[1])+3, sin(x[0]-2*
InterpolateItemValue<TinyMatrix<2>(TinyVector<Dimension>)>::interpolate(function_symbol_id, xj,
cell_id_list);
REQUIRE(same_cell_value(cell_value, interpolate_value));
REQUIRE(same_item_value(cell_value, interpolate_value));
}
}
}
......@@ -973,7 +973,7 @@ let R2x2_non_linear_3d: R^3 -> R^2x2, x -> (2 * exp(x[0]) * sin(x[1]) + 3 * cos(
Array<const double> interpolate_value =
InterpolateItemValue<double(TinyVector<Dimension>)>::interpolate(function_symbol_id, xj, cell_id_list);
REQUIRE(same_cell_value(cell_value, interpolate_value));
REQUIRE(same_item_value(cell_value, interpolate_value));
}
SECTION("scalar_non_linear_3d")
......@@ -993,7 +993,7 @@ let R2x2_non_linear_3d: R^3 -> R^2x2, x -> (2 * exp(x[0]) * sin(x[1]) + 3 * cos(
Array<const double> interpolate_value =
InterpolateItemValue<double(TinyVector<Dimension>)>::interpolate(function_symbol_id, xj, cell_id_list);
REQUIRE(same_cell_value(cell_value, interpolate_value));
REQUIRE(same_item_value(cell_value, interpolate_value));
}
SECTION("R3_affine_3d")
......@@ -1014,7 +1014,7 @@ let R2x2_non_linear_3d: R^3 -> R^2x2, x -> (2 * exp(x[0]) * sin(x[1]) + 3 * cos(
InterpolateItemValue<TinyVector<3>(TinyVector<Dimension>)>::interpolate(function_symbol_id, xj,
cell_id_list);
REQUIRE(same_cell_value(cell_value, interpolate_value));
REQUIRE(same_item_value(cell_value, interpolate_value));
}
SECTION("R3_non_linear_3d")
......@@ -1035,7 +1035,7 @@ let R2x2_non_linear_3d: R^3 -> R^2x2, x -> (2 * exp(x[0]) * sin(x[1]) + 3 * cos(
InterpolateItemValue<TinyVector<3>(TinyVector<Dimension>)>::interpolate(function_symbol_id, xj,
cell_id_list);
REQUIRE(same_cell_value(cell_value, interpolate_value));
REQUIRE(same_item_value(cell_value, interpolate_value));
}
SECTION("R2x2_affine_3d")
......@@ -1057,7 +1057,7 @@ let R2x2_non_linear_3d: R^3 -> R^2x2, x -> (2 * exp(x[0]) * sin(x[1]) + 3 * cos(
InterpolateItemValue<TinyMatrix<2>(TinyVector<Dimension>)>::interpolate(function_symbol_id, xj,
cell_id_list);
REQUIRE(same_cell_value(cell_value, interpolate_value));
REQUIRE(same_item_value(cell_value, interpolate_value));
}
SECTION("R2x2_non_linear_3d")
......@@ -1079,7 +1079,7 @@ let R2x2_non_linear_3d: R^3 -> R^2x2, x -> (2 * exp(x[0]) * sin(x[1]) + 3 * cos(
InterpolateItemValue<TinyMatrix<2>(TinyVector<Dimension>)>::interpolate(function_symbol_id, xj,
cell_id_list);
REQUIRE(same_cell_value(cell_value, interpolate_value));
REQUIRE(same_item_value(cell_value, interpolate_value));
}
}
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment