Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

GRIDEDIT-1452: Revert correct intersected/non-intersected faces deletion options #376

Merged
merged 1 commit into from
Oct 17, 2024
Merged

GRIDEDIT-1452: Revert correct intersected/non-intersected faces deletion options #376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions libs/MeshKernel/src/Mesh2D.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1744,7 +1744,7 @@ std::unique_ptr<meshkernel::UndoAction> Mesh2D::DeleteMesh(const Polygons& polyg
else if (deletionOption == InsideNotIntersected && invertDeletion)
{
excludedFace = [&isFaceCompletlyIncludedInPolygon, &faceIntersections](UInt f)
{ return isFaceCompletlyIncludedInPolygon[f] || faceIntersections[f].faceIndex != constants::missing::uintValue; };
{ return isFaceCompletlyIncludedInPolygon[f] && faceIntersections[f].faceIndex == constants::missing::uintValue; };
}
else if (deletionOption == InsideAndIntersected && !invertDeletion)
{
Expand All @@ -1754,7 +1754,7 @@ std::unique_ptr<meshkernel::UndoAction> Mesh2D::DeleteMesh(const Polygons& polyg
else if (deletionOption == InsideAndIntersected && invertDeletion)
{
excludedFace = [&isFaceCompletlyIncludedInPolygon, &faceIntersections](UInt f)
{ return isFaceCompletlyIncludedInPolygon[f] && faceIntersections[f].faceIndex == constants::missing::uintValue; };
{ return isFaceCompletlyIncludedInPolygon[f] || faceIntersections[f].faceIndex != constants::missing::uintValue; };
}

// Mark edges for deletion
Expand Down
74 changes: 36 additions & 38 deletions libs/MeshKernel/tests/src/MeshTests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -716,8 +716,8 @@ class MeshDeletion : public ::testing::TestWithParam<std::tuple<meshkernel::Mesh
return {
{meshkernel::Mesh2D::DeleteMeshOptions::InsideNotIntersected, false, 16},
{meshkernel::Mesh2D::DeleteMeshOptions::InsideAndIntersected, false, 14},
{meshkernel::Mesh2D::DeleteMeshOptions::InsideNotIntersected, true, 6},
{meshkernel::Mesh2D::DeleteMeshOptions::InsideAndIntersected, true, 0}
{meshkernel::Mesh2D::DeleteMeshOptions::InsideNotIntersected, true, 0},
{meshkernel::Mesh2D::DeleteMeshOptions::InsideAndIntersected, true, 6}

};
}
Expand Down Expand Up @@ -747,8 +747,7 @@ TEST_P(MeshDeletion, expected_results)
auto undoAction = mesh->DeleteMesh(polygon, deleteOption, invertSelection);

// Assert
const auto numValidNodes = mesh->GetNumValidNodes();
ASSERT_EQ(numNodes, numValidNodes);
ASSERT_EQ(numNodes, mesh->GetNumValidNodes());

// Test the undo action has been computed correctly
undoAction->Restore();
Expand Down Expand Up @@ -776,44 +775,43 @@ INSTANTIATE_TEST_SUITE_P(Mesh, MeshDeletion, ::testing::ValuesIn(MeshDeletion::G
class MeshDeletionWithInnerPolygons : public ::testing::TestWithParam<std::tuple<meshkernel::Mesh2D::DeleteMeshOptions, bool, std::vector<meshkernel::Point>, int>>
{

static inline std::vector<meshkernel::Point> single_polygon_{
{-0.722886114680926, 2.22765832371444},
{1.50244688883463, 2.65710855246306},
{3.04456361934103, 1.91533088462454},
{3.47401384808964, 5.56565782898778},
{-1.42562285263321, 5.70230108358961},
{-0.722886114680926, 2.22765832371444},
static inline std::vector<meshkernel::Point> firstPolygon_{
{-0.5, -0.5},
{7.5, -0.5},
{7.5, 7.5},
{-0.5, 7.5},
{-0.5, -0.5},
{meshkernel::constants::missing::innerOuterSeparator, meshkernel::constants::missing::innerOuterSeparator},
{1.5, 1.5},
{4.5, 1.5},
{4.5, 4.5},
{1.5, 4.5},
{1.5, 1.5},
};

static inline std::vector<meshkernel::Point> double_polygon_{
{-0.722886114680926, 2.22765832371444},
{1.50244688883463, 2.65710855246306},
{3.04456361934103, 1.91533088462454},
{3.47401384808964, 5.56565782898778},
{-1.42562285263321, 5.70230108358961},
{-0.722886114680926, 2.22765832371444},
{meshkernel::constants::missing::doubleValue, meshkernel::constants::missing::doubleValue},
{3.59021337251456, -1.90949318892618},
{6.02802927483664, -1.86121960670198},
{5.88320852816404, 2.09721413568238},
{2.55233135469427, 0.600733086732198},
{3.59021337251456, -1.90949318892618},
};
static inline std::vector<meshkernel::Point> secondPolygon_{
{-0.5, -0.5},
{7.5, -0.5},
{7.5, 7.5},
{-0.5, 7.5},
{-0.5, -0.5},
{meshkernel::constants::missing::innerOuterSeparator, meshkernel::constants::missing::innerOuterSeparator},
{1.5, 1.5},
{4.5, 1.5},
{4.5, 4.5},
{2.7, 4.5},
{2.7, 3.3},
{1.5, 3.3},
{1.5, 1.5}};

public:
[[nodiscard]] static std::vector<std::tuple<meshkernel::Mesh2D::DeleteMeshOptions, bool, std::vector<meshkernel::Point>, int>> GetData()
{
return {
{meshkernel::Mesh2D::DeleteMeshOptions::InsideAndIntersected, false, single_polygon_, 23},
{meshkernel::Mesh2D::DeleteMeshOptions::InsideNotIntersected, false, single_polygon_, 30},
{meshkernel::Mesh2D::DeleteMeshOptions::InsideAndIntersected, true, single_polygon_, 12},
{meshkernel::Mesh2D::DeleteMeshOptions::InsideNotIntersected, true, single_polygon_, 23},
{meshkernel::Mesh2D::DeleteMeshOptions::InsideAndIntersected, false, double_polygon_, 17},
{meshkernel::Mesh2D::DeleteMeshOptions::InsideNotIntersected, false, double_polygon_, 29},
{meshkernel::Mesh2D::DeleteMeshOptions::InsideAndIntersected, true, double_polygon_, 16},
{meshkernel::Mesh2D::DeleteMeshOptions::InsideNotIntersected, true, double_polygon_, 29}

};
{meshkernel::Mesh2D::DeleteMeshOptions::InsideAndIntersected, false, firstPolygon_, 9},
{meshkernel::Mesh2D::DeleteMeshOptions::InsideAndIntersected, true, firstPolygon_, 48},
{meshkernel::Mesh2D::DeleteMeshOptions::InsideAndIntersected, false, secondPolygon_, 8},
{meshkernel::Mesh2D::DeleteMeshOptions::InsideAndIntersected, true, secondPolygon_, 49}};
}
};

Expand All @@ -823,7 +821,7 @@ TEST_P(MeshDeletionWithInnerPolygons, expected_results)
auto const& [deleteOption, invertSelection, polygonNodes, numNodes] = GetParam();

// Setup
auto mesh = MakeRectangularMeshForTesting(6, 6, 1.0, meshkernel::Projection::cartesian);
auto mesh = MakeRectangularMeshForTesting(7, 7, 1.0, meshkernel::Projection::cartesian);

const std::vector<meshkernel::Point> originalNodes(mesh->Nodes());
const std::vector<meshkernel::Edge> originalEdges(mesh->Edges());
Expand All @@ -834,8 +832,8 @@ TEST_P(MeshDeletionWithInnerPolygons, expected_results)
auto undoAction = mesh->DeleteMesh(polygon, deleteOption, invertSelection);

// Assert
const auto numValidNodes = mesh->GetNumValidNodes();
ASSERT_EQ(numNodes, numValidNodes);
const auto nodes = mesh->Nodes();
ASSERT_EQ(numNodes, mesh->GetNumValidNodes());

// Test the undo action has been computed correctly
undoAction->Restore();
Expand Down
Loading