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

Add timestamps to base classes

This commit is contained in:
Laurent Rineau 2024-01-14 20:40:30 +01:00
parent 2838441b6a
commit c6ac1e890d
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Triangulation_3/include/CGAL/Conforming_Delaunay_triangulation_3.h
View File

@ -25,6 +25,7 @@
#include <CGAL/license/Triangulation_3.h> #include <CGAL/license/Triangulation_3.h>
#include <CGAL/Base_with_time_stamp.h>
#include <CGAL/Triangulation_2/internal/Polyline_constraint_hierarchy_2.h> #include <CGAL/Triangulation_2/internal/Polyline_constraint_hierarchy_2.h>
#include <CGAL/Triangulation_segment_traverser_3.h> #include <CGAL/Triangulation_segment_traverser_3.h>
@ -41,7 +42,7 @@ namespace CGAL {
enum class CDT_3_vertex_type { FREE, CORNER, STEINER_ON_EDGE, STEINER_IN_FACE }; enum class CDT_3_vertex_type { FREE, CORNER, STEINER_ON_EDGE, STEINER_IN_FACE };
template <typename Gt, typename Vb = Triangulation_vertex_base_3<Gt> > template <typename Gt, typename Vb = Triangulation_vertex_base_3<Gt> >
struct Conforming_Delaunay_triangulation_vertex_base_3 : public Vb { struct Conforming_Delaunay_triangulation_vertex_base_3 : public Base_with_time_stamp<Vb> {
int nb_of_incident_constraints = 0; int nb_of_incident_constraints = 0;
void* c_id = nullptr; void* c_id = nullptr;
private: private:
@ -54,7 +55,8 @@ public:
typedef Conforming_Delaunay_triangulation_vertex_base_3 <Gt, Vb3> Other; typedef Conforming_Delaunay_triangulation_vertex_base_3 <Gt, Vb3> Other;
}; };
using Vb::Vb; using Base = Base_with_time_stamp<Vb>;
using Base::Base;
template<typename Triangulation> template<typename Triangulation>
auto constraint_id(const Triangulation&) const { auto constraint_id(const Triangulation&) const {

5
Triangulation_3/include/CGAL/Constrained_Delaunay_triangulation_3.h
View File

@ -25,6 +25,7 @@
#include <CGAL/license/Triangulation_3.h> #include <CGAL/license/Triangulation_3.h>
#include <CGAL/Base_with_time_stamp.h>
#include <CGAL/Triangulation_vertex_base_3.h> #include <CGAL/Triangulation_vertex_base_3.h>
#include <CGAL/Triangulation_cell_base_3.h> #include <CGAL/Triangulation_cell_base_3.h>
#include <CGAL/Triangulation_vertex_base_with_info_2.h> #include <CGAL/Triangulation_vertex_base_with_info_2.h>
@ -99,9 +100,9 @@ public:
template <typename Gt, typename Cb = Triangulation_cell_base_3<Gt> > template <typename Gt, typename Cb = Triangulation_cell_base_3<Gt> >
class Constrained_Delaunay_triangulation_cell_base_3 class Constrained_Delaunay_triangulation_cell_base_3
: public Cb : public Base_with_time_stamp<Cb>
{ {
using Base = Cb; using Base = Base_with_time_stamp<Cb>;
std::array<CDT_3_face_index, 4> face_id = { -1, -1, -1, -1 }; std::array<CDT_3_face_index, 4> face_id = { -1, -1, -1, -1 };
std::array<void*, 4> facet_2d = {nullptr, nullptr, nullptr, nullptr}; std::array<void*, 4> facet_2d = {nullptr, nullptr, nullptr, nullptr};

5
Triangulation_3/test/Triangulation_3/cdt_3_from_off.cpp
View File

@ -5,7 +5,6 @@
#include <CGAL/Delaunay_triangulation_3.h> #include <CGAL/Delaunay_triangulation_3.h>
#include <CGAL/Random.h> #include <CGAL/Random.h>
#include <CGAL/Constrained_Delaunay_triangulation_3.h> #include <CGAL/Constrained_Delaunay_triangulation_3.h>
#include <CGAL/Base_with_time_stamp.h>
#include <CGAL/Surface_mesh.h> #include <CGAL/Surface_mesh.h>
#include <CGAL/IO/File_binary_mesh_3.h> #include <CGAL/IO/File_binary_mesh_3.h>
@ -44,8 +43,8 @@ using K = CGAL::Exact_predicates_inexact_constructions_kernel;
#endif // use Epick #endif // use Epick
using Vb = CGAL::Base_with_time_stamp<CGAL::Constrained_Delaunay_triangulation_vertex_base_3<K>>; using Vb = CGAL::Constrained_Delaunay_triangulation_vertex_base_3<K>;
using Cb = CGAL::Base_with_time_stamp<CGAL::Constrained_Delaunay_triangulation_cell_base_3<K>>; using Cb = CGAL::Constrained_Delaunay_triangulation_cell_base_3<K>;
using Tds = CGAL::Triangulation_data_structure_3<Vb, Cb>; using Tds = CGAL::Triangulation_data_structure_3<Vb, Cb>;
using Delaunay = CGAL::Delaunay_triangulation_3<K, Tds>; using Delaunay = CGAL::Delaunay_triangulation_3<K, Tds>;
using CDT = CGAL::Constrained_Delaunay_triangulation_3<Delaunay>; using CDT = CGAL::Constrained_Delaunay_triangulation_3<Delaunay>;