From 19508d768441d51fbf3421467804313bf2bc595b Mon Sep 17 00:00:00 2001
From: "Dmitry Yu. Naumov" <github@naumov.de>
Date: Sat, 18 Jul 2015 15:47:05 +0000
Subject: [PATCH] [MeL] Rename and document searchByElementIDs.
---
MeshLib/MeshEditing/RemoveMeshComponents.cpp | 2 +-
MeshLib/MeshSearch/NodeSearch.cpp | 7 +++++--
MeshLib/MeshSearch/NodeSearch.h | 10 ++--------
3 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/MeshLib/MeshEditing/RemoveMeshComponents.cpp b/MeshLib/MeshEditing/RemoveMeshComponents.cpp
index 06a657345bd..5bdbf978248 100644
--- a/MeshLib/MeshEditing/RemoveMeshComponents.cpp
+++ b/MeshLib/MeshEditing/RemoveMeshComponents.cpp
@@ -63,7 +63,7 @@ MeshLib::Mesh* removeElements(const MeshLib::Mesh& mesh, const std::vector<std::
// delete unused nodes
NodeSearch ns(mesh);
- ns.searchByElementIDs(removed_element_ids);
+ ns.markNodesConnectedToElements(removed_element_ids);
auto &removed_node_ids(ns.getSearchedNodeIDs());
INFO("Removing total %d nodes...", removed_node_ids.size());
for (auto nodeid : removed_node_ids)
diff --git a/MeshLib/MeshSearch/NodeSearch.cpp b/MeshLib/MeshSearch/NodeSearch.cpp
index a51b460e52c..194cc77ebf3 100644
--- a/MeshLib/MeshSearch/NodeSearch.cpp
+++ b/MeshLib/MeshSearch/NodeSearch.cpp
@@ -24,7 +24,8 @@ NodeSearch::NodeSearch(const MeshLib::Mesh &mesh)
{
}
-std::vector<std::size_t> NodeSearch::searchByElementIDsMatchAllConnectedElements(const std::vector<std::size_t> &elements)
+std::size_t NodeSearch::markNodesConnectedToElements(
+ const std::vector<std::size_t> &elements)
{
// Find out by how many elements a node would be removed.
//
@@ -49,7 +50,9 @@ std::vector<std::size_t> NodeSearch::searchByElementIDsMatchAllConnectedElements
if (node_marked_counts[i] == _mesh.getNode(i)->getElements().size())
connected_nodes.push_back(i);
}
- return connected_nodes;
+
+ this->updateUnion(connected_nodes);
+ return connected_nodes.size();
}
std::size_t NodeSearch::searchUnused()
diff --git a/MeshLib/MeshSearch/NodeSearch.h b/MeshLib/MeshSearch/NodeSearch.h
index 72278be3baf..97d9b562198 100644
--- a/MeshLib/MeshSearch/NodeSearch.h
+++ b/MeshLib/MeshSearch/NodeSearch.h
@@ -30,14 +30,8 @@ public:
const std::vector<std::size_t>& getSearchedNodeIDs() const {return _marked_nodes; }
/// Marks all nodes connected to any of the given elements ids.
- std::size_t searchByElementIDs(const std::vector<std::size_t> &element_ids)
- {
- std::vector<std::size_t> connected_nodes =
- searchByElementIDsMatchAllConnectedElements(element_ids);
-
- this->updateUnion(connected_nodes);
- return connected_nodes.size();
- }
+ /// \return number of connected nodes.
+ std::size_t markNodesConnectedToElements(const std::vector<std::size_t> &element_ids);
/// Marks all unused nodes
std::size_t searchUnused();
--
GitLab