songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove explicit specialization for find_spanning_tree

This commit is contained in:
Thien Hoang 2019-06-20 18:12:00 +07:00
parent a97d60c254
commit deee186789
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Surface_mesh_topology/include/CGAL/Shortest_noncontractible_cycle.h
View File

@ -106,6 +106,14 @@ public:
private: private:
void find_spanning_tree(Dart_handle root, Dart_container& spanning_tree,
std::vector<Distance_type>& distance_from_root, std::vector<int>& trace_index) {
if (std::is_same<WeightFunctor, void>::value)
find_BFS_tree(root, spanning_tree, distance_from_root, trace_index);
else
find_Dijkstra_tree(root, spanning_tree, distance_from_root, trace_index);
}
struct Dijkstra_comparator { struct Dijkstra_comparator {
Dijkstra_comparator(const std::vector<Distance_type>& distance_from_root) : m_distance(distance_from_root) {} Dijkstra_comparator(const std::vector<Distance_type>& distance_from_root) : m_distance(distance_from_root) {}
bool operator()(const int x, const int y) const { return m_distance[x] > m_distance[y]; } bool operator()(const int x, const int y) const { return m_distance[x] > m_distance[y]; }
@ -114,8 +122,7 @@ private:
}; };
/// Create a spanning tree using Dijkstra /// Create a spanning tree using Dijkstra
template <class> void find_Dijkstra_tree(Dart_handle root, Dart_container& spanning_tree,
void find_spanning_tree(Dart_handle root, Dart_container& spanning_tree,
std::vector<Distance_type>& distance_from_root, std::vector<int>& trace_index) { std::vector<Distance_type>& distance_from_root, std::vector<int>& trace_index) {
// Preparation // Preparation
Dijkstra_comparator dc (distance_from_root); Dijkstra_comparator dc (distance_from_root);
@ -170,8 +177,7 @@ private:
} }
/// Create a spanning tree using BFS /// Create a spanning tree using BFS
template <> void find_BFS_tree(Dart_handle root, Dart_container& spanning_tree,
void find_spanning_tree<void>(Dart_handle root, Dart_container& spanning_tree,
std::vector<Distance_type>& distance_from_root, std::vector<int>& trace_index) { std::vector<Distance_type>& distance_from_root, std::vector<int>& trace_index) {
// Preparation // Preparation
std::queue<int> q; std::queue<int> q;
@ -297,7 +303,7 @@ private:
m_trace_index.clear(); m_trace_index.clear();
for (auto it = m_gmap.template one_dart_per_cell<0>().begin(), itend = m_gmap.template one_dart_per_cell<0>().end(); it != itend; ++it) for (auto it = m_gmap.template one_dart_per_cell<0>().begin(), itend = m_gmap.template one_dart_per_cell<0>().end(); it != itend; ++it)
m_gmap.template info<0>(it) = -1; m_gmap.template info<0>(it) = -1;
find_spanning_tree<WeightFunctor>(root, m_spanning_tree, m_distance_from_root, m_trace_index); find_spanning_tree(root, m_spanning_tree, m_distance_from_root, m_trace_index);
find_noncon_edges(m_spanning_tree, m_noncon_edges); find_noncon_edges(m_spanning_tree, m_noncon_edges);
// std::cerr << "Done find_noncon_edges. noncon_edges.size() = " << m_noncon_edges.size() << '\n'; // std::cerr << "Done find_noncon_edges. noncon_edges.size() = " << m_noncon_edges.size() << '\n';