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

Merge remote-tracking branch 'cgal/6.0.x-branch' into 'cgal/6.1.x-branch'

This commit is contained in:
Sébastien Loriot 2025-10-13 09:41:18 +02:00
parent 10a9d44a10 754e57ac3c
commit 3e77bff198
2 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Optimal_transportation_reconstruction_2/include/CGAL/OTR_2/Reconstruction_face_base_2.h
View File

@ -17,6 +17,8 @@
#include <CGAL/OTR_2/Cost.h> #include <CGAL/OTR_2/Cost.h>
#include <CGAL/Triangulation_face_base_2.h> #include <CGAL/Triangulation_face_base_2.h>
#include <CGAL/Has_timestamp.h>
#include <CGAL/Time_stamper.h>
#include <vector> #include <vector>
@ -62,6 +64,8 @@ private:
FT m_relevance[3]; FT m_relevance[3];
std::size_t time_stamp_ = std::size_t(-2);
public: public:
Reconstruction_face_base_2() Reconstruction_face_base_2()
{ {
@ -190,6 +194,18 @@ public:
for (int i = 0; i < 3; ++i) for (int i = 0; i < 3; ++i)
clean_samples(i); clean_samples(i);
} }
/// For the determinism of Compact_container iterators
///@{
typedef Tag_true Has_timestamp;
std::size_t time_stamp() const {
return time_stamp_;
}
void set_time_stamp(const std::size_t& ts) {
time_stamp_ = ts;
}
///@}
}; };
//---------------STRUCT LESS FACE_HANDLE--------------------- //---------------STRUCT LESS FACE_HANDLE---------------------

15
Optimal_transportation_reconstruction_2/include/CGAL/OTR_2/Reconstruction_vertex_base_2.h
View File

@ -16,6 +16,8 @@
#include <CGAL/Triangulation_vertex_base_2.h> #include <CGAL/Triangulation_vertex_base_2.h>
#include <CGAL/Has_timestamp.h>
#include <CGAL/Time_stamper.h>
#include <CGAL/OTR_2/Sample.h> #include <CGAL/OTR_2/Sample.h>
namespace CGAL { namespace CGAL {
@ -53,6 +55,7 @@ private:
int m_sample; int m_sample;
Point m_relocated; Point m_relocated;
FT m_relevance; FT m_relevance;
std::size_t time_stamp_ = std::size_t(-2);
public: public:
@ -110,6 +113,18 @@ public:
Point& relocated() { return m_relocated; } Point& relocated() { return m_relocated; }
bool has_sample_assigned() const { return sample() != -1; } bool has_sample_assigned() const { return sample() != -1; }
/// For the determinism of Compact_container iterators
///@{
typedef Tag_true Has_timestamp;
std::size_t time_stamp() const {
return time_stamp_;
}
void set_time_stamp(const std::size_t& ts) {
time_stamp_ = ts;
}
///@}
}; };
//---------------STRUCT LESS VERTEX_HANDLE--------------------- //---------------STRUCT LESS VERTEX_HANDLE---------------------
template <class T> template <class T>