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

Add specializations of hash

This commit is contained in:
Andreas Fabri 2015-04-17 10:44:43 +02:00
parent 7f0bdd272d
commit 0eaa9235d0
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
BGL/include/CGAL/boost/graph/graph_traits_Triangulation_2.h
View File

@ -67,9 +67,10 @@ public:
return *this; return *this;
} }
Face_handle face_handle() const std::size_t hash() const
{ {
return this->first; std::hash<Face_handle> fct;
return fct(this->first);
} }
bool operator==(const Edge& other) const bool operator==(const Edge& other) const
@ -273,6 +274,12 @@ public:
: first(fd), second(i) : first(fd), second(i)
{} {}
std::size_t hash() const
{
std::hash<face_descriptor> fct;
return fct(first);
}
bool operator==(const T2_halfedge_descriptor& other) const bool operator==(const T2_halfedge_descriptor& other) const
{ {
return (first == other.first) && (second == other.second); return (first == other.first) && (second == other.second);
@ -830,8 +837,16 @@ namespace std {
std::size_t operator()(const CGAL::detail::Edge<T,EdgeBase>& e) std::size_t operator()(const CGAL::detail::Edge<T,EdgeBase>& e)
{ {
std::cerr << "Triangulation_2::Edge HashFct" << std::endl; std::cerr << "Triangulation_2::Edge HashFct" << std::endl;
std::hash<typename CGAL::detail::Edge<T,EdgeBase>::Face_handle> fct; return e.hash();
return fct(e.face_handle()); }
};
template < class Tr>
struct hash<CGAL::detail::T2_halfedge_descriptor<Tr> > {
std::size_t operator()(const CGAL::detail::T2_halfedge_descriptor<Tr>& e)
{
std::cerr << "Triangulation_2::halfedge_descriptor HashFct" << std::endl;
return e.hash();
} }
}; };
} // namespace std } // namespace std

2
Surface_mesh/examples/Surface_mesh/unordered_set.cpp
View File

@ -49,7 +49,7 @@ int main()
std::cout << "\ngraph_traits<Triangulation_2>::_descriptor"<< std::endl; std::cout << "\ngraph_traits<Triangulation_2>::_descriptor"<< std::endl;
Unordered<boost::graph_traits<Triangulation_2>::vertex_descriptor> U3; Unordered<boost::graph_traits<Triangulation_2>::vertex_descriptor> U3;
// Unordered<boost::graph_traits<Triangulation_2>::halfedge_descriptor> U4; Unordered<boost::graph_traits<Triangulation_2>::halfedge_descriptor> U4;
Unordered<boost::graph_traits<Triangulation_2>::edge_descriptor> U5; Unordered<boost::graph_traits<Triangulation_2>::edge_descriptor> U5;
Unordered<boost::graph_traits<Triangulation_2>::face_descriptor> U6; Unordered<boost::graph_traits<Triangulation_2>::face_descriptor> U6;
} }