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

Implement the check that avoids to insert a constraint twice

This commit is contained in:
Laurent Rineau 2018-08-03 11:24:47 +02:00
parent 2d89a5ec5b
commit 9afcd23be8
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Triangulation_2/include/CGAL/Constrained_triangulation_plus_2.h
View File

@ -265,7 +265,7 @@ public:
{
// protects against inserting a zero length constraint
if(va == vb){
return Constraint_id(NULL);
return Constraint_id(NULL);
}
// protects against inserting twice the same constraint
Constraint_id cid = hierarchy.insert_constraint(va, vb);

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

@ -191,9 +191,10 @@ private:
Compare comp;
Constraint_set constraint_set;
Sc_to_c_map sc_to_c_map;
std::map<std::pair<Vertex_handle, Vertex_handle>,
Constraint_id,
Pair_compare> constraint_map;
typedef std::map<std::pair<Vertex_handle, Vertex_handle>,
Constraint_id,
Pair_compare> Constraint_map;
Constraint_map constraint_map;
public:
Polyline_constraint_hierarchy_2(const Compare& comp)
@ -866,6 +867,14 @@ typename Polyline_constraint_hierarchy_2<T,Compare,Data>::Vertex_list*
Polyline_constraint_hierarchy_2<T,Compare,Data>::
insert_constraint(T va, T vb){
Edge he = make_edge(va, vb);
// First, check if the constraint was already inserted.
// If it was not, then the iterator to the lower bound will serve as
// the hint of the insertion.
typename Constraint_map::iterator c_map_it = constraint_map.lower_bound(he);
if(c_map_it != constraint_map.end() && he == c_map_it->first)
return 0;
Vertex_list* children = new Vertex_list;
Context_list* fathers;
@ -885,7 +894,8 @@ insert_constraint(T va, T vb){
ctxt.pos = children->skip_begin();
fathers->push_front(ctxt);
constraint_map[he] = children;
constraint_map.insert(c_map_it,
typename Constraint_map::value_type(he, children));
return children;
}