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

cleanup

This commit is contained in:
Andreas Fabri 2014-11-06 15:50:05 +01:00
parent c773eb29b2
commit 0e535324f0
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Polyline_simplification_2/examples/Polyline_simplification_2/points_and_vertices.cpp
View File

@ -60,7 +60,7 @@ int main( )
PS::simplify(ct, cid, Cost(), Stop(0.5), keep_points); PS::simplify(ct, cid, Cost(), Stop(0.5), keep_points);
print(ct, cid); print(ct, cid);
PS::simplify(ct, cid, Cost(), Stop(0.5), keep_points); PS::simplify(ct, cid, Cost(), Stop(0.5), keep_points);
ct.remove_points_from_constraint(cid); ct.remove_points_without_corresponding_vertex(cid);
print(ct, cid); print(ct, cid);
return 0; return 0;

4
Polyline_simplification_2/include/CGAL/Polyline_simplification_2/simplify.h
View File

@ -426,7 +426,7 @@ simplify(CGAL::Constrained_triangulation_plus_2<CDT>& ct,
while(simplifier()){} while(simplifier()){}
if(! keep_points){ if(! keep_points){
ct.remove_points_from_constraint(cid); ct.remove_points_without_corresponding_vertex(cid);
} }
return simplifier.number_of_removed_vertices(); return simplifier.number_of_removed_vertices();
} }
@ -457,7 +457,7 @@ simplify(CGAL::Constrained_triangulation_plus_2<CDT>& ct,
while(simplifier()){} while(simplifier()){}
if(! keep_points){ if(! keep_points){
ct.remove_points_from_constraints(); ct.remove_points_without_corresponding_vertex();
} }
return simplifier.number_of_removed_vertices(); return simplifier.number_of_removed_vertices();
} }

4
Triangulation_2/doc/Triangulation_2/CGAL/Constrained_triangulation_plus_2.h
View File

@ -427,8 +427,8 @@ Points_in_constraint_iterator points_in_constraint_end(Constraint_id cid) const
\cgalAdvancedBegin \cgalAdvancedBegin
Removes the vertex at `vicq` from the constraint and the triangulation. Removes the vertex at `vicq` from the constraint and the triangulation.
The point of that vertex remains stored in the sequence of original points The point of that vertex remains stored in the sequence of original points
of the constraint until `remove_points_without_vertex_from_constraint(Constraint_id)` of the constraint until `remove_points_without_corresponding_vertex(Constraint_id)`
or `remove_points_without_vertex_from_constraints()` is called. or `remove_points_without_corresponding_vertex()` is called.
The polyline simplification algorithm described in Chapter The polyline simplification algorithm described in Chapter
\ref Chapter_2D_Polyline_simplification \ref Chapter_2D_Polyline_simplification

8
Triangulation_2/include/CGAL/Polyline_constrained_triangulation_2.h
View File

@ -623,13 +623,13 @@ public:
Triangulation::insert_constraint(*u, *w); Triangulation::insert_constraint(*u, *w);
} }
std::size_t remove_points_from_constraint(Constraint_id cid) std::size_t remove_points_without_corresponding_vertex(Constraint_id cid)
{ {
return hierarchy.remove_points_from_constraint(cid); return hierarchy.remove_points_without_corresponding_vertex(cid);
} }
std::size_t remove_points_from_constraints() std::size_t remove_points_without_corresponding_vertex()
{ {
return hierarchy.remove_points_from_constraints(); return hierarchy.remove_points_without_corresponding_vertex();
} }

10
Triangulation_2/include/CGAL/Polyline_constraint_hierarchy_2.h
View File

@ -253,8 +253,8 @@ public:
Vertex_it v, Vertex_it v,
Vertex_it w); Vertex_it w);
std::size_t remove_points_from_constraint(Constraint_id); std::size_t remove_points_without_corresponding_vertex(Constraint_id);
std::size_t remove_points_from_constraints(); std::size_t remove_points_without_corresponding_vertex();
Constraint_id concatenate(Constraint_id first, Constraint_id second); Constraint_id concatenate(Constraint_id first, Constraint_id second);
Constraint_id concatenate2(Constraint_id first, Constraint_id second); Constraint_id concatenate2(Constraint_id first, Constraint_id second);
@ -648,7 +648,7 @@ void Polyline_constraint_hierarchy_2<T,Data>::simplify(Vertex_it uc,
template <class T, class Data> template <class T, class Data>
std::size_t std::size_t
Polyline_constraint_hierarchy_2<T,Data>::remove_points_from_constraint(Constraint_id cid) Polyline_constraint_hierarchy_2<T,Data>::remove_points_without_corresponding_vertex(Constraint_id cid)
{ {
std::size_t n = 0; std::size_t n = 0;
for(Point_it it = points_in_constraint_begin(cid); for(Point_it it = points_in_constraint_begin(cid);
@ -663,11 +663,11 @@ Polyline_constraint_hierarchy_2<T,Data>::remove_points_from_constraint(Constrain
template <class T, class Data> template <class T, class Data>
std::size_t std::size_t
Polyline_constraint_hierarchy_2<T,Data>::remove_points_from_constraints() Polyline_constraint_hierarchy_2<T,Data>::remove_points_without_corresponding_vertex()
{ {
std::size_t n = 0; std::size_t n = 0;
for(C_iterator it = constraint_set.begin(); it!= constraint_set.end(); ++it){ for(C_iterator it = constraint_set.begin(); it!= constraint_set.end(); ++it){
n+= remove_points_from_constraint(*it); n+= remove_points_without_corresponding_vertex(*it);
} }
return n; return n;
} }