From a594c3717c2267d81f0e9238e869da2af62450a5 Mon Sep 17 00:00:00 2001
From: "Dmitry Yu. Naumov" <github@naumov.de>
Date: Sat, 18 Jul 2015 14:49:43 +0000
Subject: [PATCH] [MeL] Remove unused searchByElementIDs variant.
---
MeshLib/MeshEditing/RemoveMeshComponents.cpp | 2 +-
MeshLib/MeshSearch/NodeSearch.cpp | 19 -------------------
MeshLib/MeshSearch/NodeSearch.h | 9 +++------
3 files changed, 4 insertions(+), 26 deletions(-)
diff --git a/MeshLib/MeshEditing/RemoveMeshComponents.cpp b/MeshLib/MeshEditing/RemoveMeshComponents.cpp
index 2409dc14474..06a657345bd 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, true);
+ ns.searchByElementIDs(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 334c49c886d..ee765ac94a5 100644
--- a/MeshLib/MeshSearch/NodeSearch.cpp
+++ b/MeshLib/MeshSearch/NodeSearch.cpp
@@ -47,25 +47,6 @@ std::vector<std::size_t> NodeSearch::searchByElementIDsMatchAllConnectedElements
return connected_nodes;
}
-std::vector<std::size_t> NodeSearch::searchByElementIDsNotMatchAllConnectedElements(const std::vector<std::size_t> &elements)
-{
- std::vector<std::size_t> connected_nodes;
-
- for(std::size_t eid : elements)
- {
- auto* e = _mesh.getElement(eid);
- for (unsigned i=0; i<e->getNBaseNodes(); i++) {
- connected_nodes.push_back(e->getNodeIndex(i));
- }
- }
-
- std::sort(connected_nodes.begin(), connected_nodes.end());
- auto it = std::unique(connected_nodes.begin(), connected_nodes.end());
- connected_nodes.resize(std::distance(connected_nodes.begin(),it));
-
- return connected_nodes;
-}
-
std::size_t NodeSearch::searchUnused()
{
const size_t nNodes (_mesh.getNNodes());
diff --git a/MeshLib/MeshSearch/NodeSearch.h b/MeshLib/MeshSearch/NodeSearch.h
index 77d2a5a5cfc..72278be3baf 100644
--- a/MeshLib/MeshSearch/NodeSearch.h
+++ b/MeshLib/MeshSearch/NodeSearch.h
@@ -29,13 +29,11 @@ public:
/// return marked node IDs
const std::vector<std::size_t>& getSearchedNodeIDs() const {return _marked_nodes; }
- /// Marks all nodes connecting to any of the given elements
- std::size_t searchByElementIDs(const std::vector<std::size_t> &element_ids, bool only_match_all_connected_elements = false)
+ /// 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 =
- (only_match_all_connected_elements
- ? searchByElementIDsMatchAllConnectedElements(element_ids)
- : searchByElementIDsNotMatchAllConnectedElements(element_ids));
+ searchByElementIDsMatchAllConnectedElements(element_ids);
this->updateUnion(connected_nodes);
return connected_nodes.size();
@@ -46,7 +44,6 @@ public:
private:
std::vector<std::size_t> searchByElementIDsMatchAllConnectedElements(const std::vector<std::size_t> &element_ids);
- std::vector<std::size_t> searchByElementIDsNotMatchAllConnectedElements(const std::vector<std::size_t> &element_ids);
/// Updates the vector of marked items with values from vec.
void updateUnion(const std::vector<std::size_t> &vec);
--
GitLab