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

recycle the constraints indices

This commit is contained in:
Laurent Rineau 2025-01-24 19:36:57 +01:00
parent e1e94a1304
commit 9fa067cb4d
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Triangulation_2/include/CGAL/Triangulation_2/internal/Polyline_constraint_hierarchy_2.h
View File

@ -22,6 +22,7 @@
#include <set> #include <set>
#include <list> #include <list>
#include <array> #include <array>
#include <queue>
#include <boost/stl_interfaces/iterator_interface.hpp> #include <boost/stl_interfaces/iterator_interface.hpp>
@ -472,6 +473,7 @@ private:
Compare comp; Compare comp;
Sc_to_c_map sc_to_c_map; Sc_to_c_map sc_to_c_map;
std::queue<size_type> free_ids;
Constraints_set constraints_set; Constraints_set constraints_set;
} priv; } priv;
public: public:
@ -587,13 +589,20 @@ private:
// //
// then the uses of `constraints_set` // then the uses of `constraints_set`
Constraint_id create_new_constraint() { Constraint_id create_new_constraint() {
auto id{number_of_constraints() == 0 ? 0 : priv.constraints_set.rbegin()->index() + 1}; size_type id; // uninitialized
if(priv.free_ids.empty()) {
id = priv.constraints_set.size();
} else {
id = priv.free_ids.front();
priv.free_ids.pop();
}
Constraint_id cid{new Vertex_list_with_info{this}, id}; Constraint_id cid{new Vertex_list_with_info{this}, id};
priv.constraints_set.insert(cid); priv.constraints_set.insert(cid);
return cid; return cid;
} }
void erase_constraint(Constraint_id cid) { void erase_constraint(Constraint_id cid) {
priv.free_ids.push(cid.index());
priv.constraints_set.erase(cid); priv.constraints_set.erase(cid);
cid.destroy(); cid.destroy();
} }
@ -719,6 +728,7 @@ swap(Polyline_constraint_hierarchy_2& ch)
{ {
using std::swap; using std::swap;
swap(priv.comp, ch.priv.comp); swap(priv.comp, ch.priv.comp);
priv.free_ids.swap(ch.priv.free_ids);
priv.constraints_set.swap(ch.priv.constraints_set); priv.constraints_set.swap(ch.priv.constraints_set);
priv.sc_to_c_map.swap(ch.priv.sc_to_c_map); priv.sc_to_c_map.swap(ch.priv.sc_to_c_map);
} }
@ -1164,8 +1174,7 @@ clear()
cl_ptr->clear(); cl_ptr->clear();
delete cl_ptr; delete cl_ptr;
} }
priv.sc_to_c_map.clear(); priv = Priv(priv.comp);
priv.constraints_set.clear();
} }