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

Declare several operator() used for comparisons const

This commit is contained in:
Andreas Fabri 2018-02-23 15:34:15 +00:00
parent 9d12c5f356
commit e5118d1401
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Generator/include/CGAL/Random_polygon_2_sweep.h
View File

@ -88,11 +88,11 @@ class Vertex_data ;
template <class ForwardIterator, class PolygonTraits> template <class ForwardIterator, class PolygonTraits>
class Less_segments { class Less_segments {
Vertex_data<ForwardIterator, PolygonTraits> *m_vertex_data; Vertex_data<ForwardIterator, PolygonTraits> *m_vertex_data;
bool less_than_in_tree(Vertex_index i, Vertex_index j); bool less_than_in_tree(Vertex_index i, Vertex_index j) const;
public: public:
Less_segments(Vertex_data<ForwardIterator, PolygonTraits> *vertex_data) Less_segments(Vertex_data<ForwardIterator, PolygonTraits> *vertex_data)
: m_vertex_data(vertex_data) {} : m_vertex_data(vertex_data) {}
bool operator()(Vertex_index i, Vertex_index j); bool operator()(Vertex_index i, Vertex_index j) const;
}; };
template <class ForwardIterator, class PolygonTraits> template <class ForwardIterator, class PolygonTraits>
@ -144,7 +144,7 @@ public:
namespace i_generator_polygon { namespace i_generator_polygon {
template <class ForwardIterator, class PolygonTraits> template <class ForwardIterator, class PolygonTraits>
bool Less_segments<ForwardIterator, PolygonTraits>:: bool Less_segments<ForwardIterator, PolygonTraits>::
operator()(Vertex_index i, Vertex_index j) operator()(Vertex_index i, Vertex_index j) const
{ {
if (m_vertex_data->edges[j.as_int()].is_in_tree) { if (m_vertex_data->edges[j.as_int()].is_in_tree) {
return less_than_in_tree(i,j); return less_than_in_tree(i,j);
@ -155,7 +155,7 @@ operator()(Vertex_index i, Vertex_index j)
template <class ForwardIterator, class PolygonTraits> template <class ForwardIterator, class PolygonTraits>
bool Less_segments<ForwardIterator, PolygonTraits>:: bool Less_segments<ForwardIterator, PolygonTraits>::
less_than_in_tree(Vertex_index new_edge, Vertex_index tree_edge) less_than_in_tree(Vertex_index new_edge, Vertex_index tree_edge) const
{ {
#if defined(CGAL_POLY_GENERATOR_DEBUG) #if defined(CGAL_POLY_GENERATOR_DEBUG)
std::cout << "less_than_in_tree" << std::endl; std::cout << "less_than_in_tree" << std::endl;

12
Polygon/include/CGAL/Polygon_2/Polygon_2_simplicity.h
View File

@ -101,10 +101,10 @@ template <class VertexData>
class Less_segments { class Less_segments {
typedef VertexData Vertex_data; typedef VertexData Vertex_data;
Vertex_data *m_vertex_data; Vertex_data *m_vertex_data;
bool less_than_in_tree(Vertex_index i, Vertex_index j); bool less_than_in_tree(Vertex_index i, Vertex_index j) const;
public: public:
Less_segments(Vertex_data *vertex_data) : m_vertex_data(vertex_data) {} Less_segments(Vertex_data *vertex_data) : m_vertex_data(vertex_data) {}
bool operator()(Vertex_index i, Vertex_index j); bool operator()(Vertex_index i, Vertex_index j) const;
}; };
// The data in Edge_data is attached to an edge when it is (about to be) // The data in Edge_data is attached to an edge when it is (about to be)
@ -199,7 +199,7 @@ class Less_vertex_data {
public: public:
Less_vertex_data(VertexData *vd) Less_vertex_data(VertexData *vd)
: m_vertex_data(vd) {} : m_vertex_data(vd) {}
bool operator()(Vertex_index i, Vertex_index j); bool operator()(Vertex_index i, Vertex_index j) const;
}; };
} // end of namespace i_polygon } // end of namespace i_polygon
@ -209,7 +209,7 @@ public:
namespace i_polygon { namespace i_polygon {
template <class VertexData> template <class VertexData>
bool Less_segments<VertexData>:: bool Less_segments<VertexData>::
operator()(Vertex_index i, Vertex_index j) operator()(Vertex_index i, Vertex_index j) const
{ {
if (m_vertex_data->edges[j.as_int()].is_in_tree) { if (m_vertex_data->edges[j.as_int()].is_in_tree) {
return less_than_in_tree(i,j); return less_than_in_tree(i,j);
@ -220,7 +220,7 @@ operator()(Vertex_index i, Vertex_index j)
template <class VertexData> template <class VertexData>
bool Less_segments<VertexData>:: bool Less_segments<VertexData>::
less_than_in_tree(Vertex_index new_edge, Vertex_index tree_edge) less_than_in_tree(Vertex_index new_edge, Vertex_index tree_edge) const
{ {
CGAL_polygon_precondition( CGAL_polygon_precondition(
m_vertex_data->edges[tree_edge.as_int()].is_in_tree); m_vertex_data->edges[tree_edge.as_int()].is_in_tree);
@ -244,7 +244,7 @@ less_than_in_tree(Vertex_index new_edge, Vertex_index tree_edge)
template <class VertexData> template <class VertexData>
bool Less_vertex_data<VertexData>:: bool Less_vertex_data<VertexData>::
operator()(Vertex_index i, Vertex_index j) operator()(Vertex_index i, Vertex_index j) const
{ {
return m_vertex_data->less_xy_2( return m_vertex_data->less_xy_2(
m_vertex_data->point(i), m_vertex_data->point(j)); m_vertex_data->point(i), m_vertex_data->point(j));

4
Snap_rounding_2/include/CGAL/Snap_rounding_2.h
View File

@ -137,7 +137,7 @@ struct Hot_pixel_dir_cmp {
Traits_ m_gt; Traits_ m_gt;
bool operator()(const Hot_pixel * h1, const Hot_pixel * h2); bool operator()(const Hot_pixel * h1, const Hot_pixel * h2) const;
}; };
#ifdef CGAL_SR_DEBUG #ifdef CGAL_SR_DEBUG
@ -502,7 +502,7 @@ operator()(const Hot_pixel * h1, const Hot_pixel * h2) const
// segment intersect // segment intersect
template<class Traits_> template<class Traits_>
bool Hot_pixel_dir_cmp<Traits_>::operator ()(const Hot_pixel * h1, bool Hot_pixel_dir_cmp<Traits_>::operator ()(const Hot_pixel * h1,
const Hot_pixel * h2) const Hot_pixel * h2) const
{ {
typedef typename Traits_::Compare_x_2 Compare_x_2; typedef typename Traits_::Compare_x_2 Compare_x_2;
typedef typename Traits_::Compare_y_2 Compare_y_2; typedef typename Traits_::Compare_y_2 Compare_y_2;