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

rename Base_with_time_stamp to Triangulation_simplex_base_with_time_stamp

This commit is contained in:
Jane Tournois 2025-05-02 14:44:36 +02:00
parent e31144344f
commit b9fd8a3b8e
8 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Constrained_triangulation_3/include/CGAL/Conforming_Delaunay_triangulation_3.h
View File

@ -16,7 +16,6 @@
#include <CGAL/Constrained_triangulation_3/internal/config.h>
#include <CGAL/Base_with_time_stamp.h>
#include <CGAL/Conforming_constrained_Delaunay_triangulation_vertex_data_3.h>
#include <CGAL/Triangulation_2/internal/Polyline_constraint_hierarchy_2.h>
#include <CGAL/Triangulation_segment_traverser_3.h>

5
Constrained_triangulation_3/include/CGAL/Conforming_constrained_Delaunay_triangulation_3.h
View File

@ -18,14 +18,13 @@
#include <CGAL/Constrained_triangulation_3/internal/config.h>
#include <CGAL/Base_with_time_stamp.h>
#include <CGAL/Triangulation_simplex_base_with_time_stamp.h>
#include <CGAL/Conforming_constrained_Delaunay_triangulation_vertex_base_3.h>
#include <CGAL/Conforming_constrained_Delaunay_triangulation_cell_base_3.h>
#include <CGAL/Triangulation_vertex_base_3.h>
#include <CGAL/Triangulation_cell_base_3.h>
#include <CGAL/Triangulation_vertex_base_with_info_2.h>
#include <CGAL/Triangulation_face_base_with_info_2.h>
#include <CGAL/Base_with_time_stamp.h>
#include <CGAL/Constrained_Delaunay_triangulation_2.h>
#include <CGAL/Constrained_triangulation_plus_2.h>
#include <CGAL/Projection_traits_3.h>
@ -1088,7 +1087,7 @@ private:
Facet facet_3d = {};
};
using Vb1 = Triangulation_vertex_base_with_info_2<Vertex_info, Projection_traits>;
using Vb = Base_with_time_stamp<Vb1>;
using Vb = Triangulation_simplex_base_with_time_stamp<Vb1>;
using Fb1 = Triangulation_face_base_with_info_2<Face_info, Projection_traits>;
using Fb = Constrained_triangulation_face_base_2<Projection_traits, Fb1>;
using TDS = Triangulation_data_structure_2<Vb, Fb>;

6
Constrained_triangulation_3/include/CGAL/Conforming_constrained_Delaunay_triangulation_cell_base_3.h
View File

@ -14,7 +14,7 @@
#include <CGAL/license/Constrained_triangulation_3.h>
#include <CGAL/Base_with_time_stamp.h>
#include <CGAL/Triangulation_simplex_base_with_time_stamp.h>
#include <CGAL/Conforming_constrained_Delaunay_triangulation_cell_data_3.h>
#include <CGAL/Triangulation_cell_base_3.h>
#include <CGAL/SMDS_3/io_signature.h>
@ -40,9 +40,9 @@ namespace CGAL {
*/
template <typename Traits, typename CellBase = Triangulation_cell_base_3<Traits> >
class Conforming_constrained_Delaunay_triangulation_cell_base_3
: public Base_with_time_stamp<CellBase>
: public Triangulation_simplex_base_with_time_stamp<CellBase>
{
using Base = Base_with_time_stamp<CellBase>;
using Base = Triangulation_simplex_base_with_time_stamp<CellBase>;
Conforming_constrained_Delaunay_triangulation_cell_data_3 ccdt_3_data_;
CDT_3_signed_index subdomain_index_ = -1;

6
Constrained_triangulation_3/include/CGAL/Conforming_constrained_Delaunay_triangulation_vertex_base_3.h
View File

@ -15,7 +15,7 @@
#include <CGAL/license/Constrained_triangulation_3.h>
#include <CGAL/Base_with_time_stamp.h>
#include <CGAL/Triangulation_simplex_base_with_time_stamp.h>
#include <CGAL/Triangulation_vertex_base_3.h>
#include <CGAL/Conforming_constrained_Delaunay_triangulation_vertex_data_3.h>
#include <CGAL/SMDS_3/io_signature.h>
@ -39,7 +39,7 @@ namespace CGAL {
*/
template < typename Traits, typename VertexBase = Triangulation_vertex_base_3<Traits> >
class Conforming_constrained_Delaunay_triangulation_vertex_base_3
: public Base_with_time_stamp<VertexBase>
: public Triangulation_simplex_base_with_time_stamp<VertexBase>
{
Conforming_constrained_Delaunay_triangulation_vertex_data_3 ccdt_3_data_;
bool cache_validity_ = false;
@ -57,7 +57,7 @@ public:
};
// constructors, inherited from the base class
using Base = Base_with_time_stamp<VertexBase>;
using Base = Triangulation_simplex_base_with_time_stamp<VertexBase>;
using Base::Base;
// model of SimplicialMeshVertexBase_3

1
Kinetic_space_partition/include/CGAL/Kinetic_space_partition_3.h
View File

@ -29,7 +29,6 @@
#include <CGAL/Real_timer.h>
#include <CGAL/Constrained_Delaunay_triangulation_2.h>
#include <CGAL/Constrained_triangulation_plus_2.h>
#include <CGAL/Base_with_time_stamp.h>
#include <CGAL/Triangulation_vertex_base_with_info_2.h>
#include <CGAL/Triangulation_face_base_with_info_2.h>

7
SMDS_3/include/CGAL/SMDS_3/io_signature.h
View File

@ -29,6 +29,10 @@
#include <CGAL/Regular_triangulation_cell_base_with_weighted_circumcenter_3.h>
#include <CGAL/type_traits.h>
#ifdef CGAL_BASE_WITH_TIME_STAMP_H
#include <CGAL/Triangulation_simplex_base_with_time_stamp.h>
#endif
#ifdef CGAL_PERIODIC_3_MESH_3_CONFIG_H
#include <CGAL/Periodic_3_triangulation_3.h>
#include <CGAL/Periodic_3_regular_triangulation_3.h>
@ -362,8 +366,7 @@ Get_io_signature<Regular_triangulation_cell_base_with_weighted_circumcenter_3<Gt
#ifdef CGAL_BASE_WITH_TIME_STAMP_H
template <class Base>
struct
Get_io_signature<Base_with_time_stamp<Base> >
struct Get_io_signature<Triangulation_simplex_base_with_time_stamp<Base>>
{
std::string operator()() {
return Get_io_signature<Base>()();

2
STL_Extension/doc/STL_Extension/Concepts/BaseWithTimeStamp.h
View File

@ -8,7 +8,7 @@ an object must provide so that its timestamp is updated by
a `CGAL::Compact_container` or a `CGAL::Concurrent_compact_container`.
\cgalHasModelsBegin
\cgalHasModels{CGAL::Base_with_time_stamp}
\cgalHasModels{CGAL::Triangulation_simplex_base_with_time_stamp}
\cgalHasModelsEnd
\sa `CGAL::Compact_container`

13
STL_Extension/include/CGAL/Base_with_time_stamp.h → STL_Extension/include/CGAL/Triangulation_simplex_base_with_time_stamp.h
View File

@ -7,8 +7,8 @@
//
// Author(s) : Laurent Rineau
#ifndef CGAL_BASE_WITH_TIME_STAMP_H
#define CGAL_BASE_WITH_TIME_STAMP_H
#ifndef CGAL_SIMPLEX_BASE_WITH_TIME_STAMP_H
#define CGAL_SIMPLEX_BASE_WITH_TIME_STAMP_H
#include <CGAL/tags.h> // for Tag_true
#include <cstdint> // for std::size_t
@ -21,8 +21,11 @@ namespace CGAL {
/// This class is a base class that can be used to add a time stamp to any class.
/// \cgalModels{BaseWithTimeStamp}
template <typename BaseWithTSBase>
class Base_with_time_stamp : public BaseWithTSBase {
class Triangulation_simplex_base_with_time_stamp
: public BaseWithTSBase
{
std::size_t time_stamp_ = std::size_t(-2);
public:
using BaseWithTSBase::BaseWithTSBase;
@ -38,10 +41,10 @@ public:
template < class TDS >
struct Rebind_TDS {
typedef typename BaseWithTSBase::template Rebind_TDS<TDS>::Other Base2;
typedef Base_with_time_stamp<Base2> Other;
typedef Triangulation_simplex_base_with_time_stamp<Base2> Other;
};
};
} // namespace CGAL
#endif // CGAL_BASE_WITH_TIME_STAMP_H
#endif // CGAL_SIMPLEX_BASE_WITH_TIME_STAMP_H