mirror of https://github.com/CGAL/cgal
initialize to -2, to use the debugging assertions
This commit is contained in:
parent
5853673267
commit
fad5e30a54
|
|
@ -97,7 +97,7 @@ template <typename Cb>
|
|||
class Cell_base_with_timestamp
|
||||
: public Cb
|
||||
{
|
||||
std::size_t time_stamp_ = std::size_t(-1);
|
||||
std::size_t time_stamp_ = std::size_t(-2);
|
||||
|
||||
public:
|
||||
using Has_timestamp = CGAL::Tag_true;
|
||||
|
|
|
|||
|
|
@ -78,7 +78,7 @@ public:
|
|||
|
||||
void set_time_stamp(const std::size_t& ts) { time_stamp_ = ts; }
|
||||
|
||||
std::size_t time_stamp_ = std::size_t(-1);
|
||||
std::size_t time_stamp_ = std::size_t(-2);
|
||||
};
|
||||
|
||||
} // namespace CGAL
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@ public:
|
|||
|
||||
void set_time_stamp(const std::size_t& ts) { time_stamp_ = ts; }
|
||||
|
||||
std::size_t time_stamp_ = std::size_t(-1);
|
||||
std::size_t time_stamp_ = std::size_t(-2);
|
||||
#endif // CGAL_MESH_2_DEBUG_REFINEMENT_POINTS
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -644,7 +644,7 @@ private:
|
|||
#ifdef CGAL_INTRUSIVE_LIST
|
||||
Cell_handle next_intrusive_ = {}, previous_intrusive_ = {};
|
||||
#endif
|
||||
std::size_t time_stamp_ = std::size_t(-1);
|
||||
std::size_t time_stamp_ = std::size_t(-2);
|
||||
|
||||
std::array<Index, 4> surface_center_index_table_ = {};
|
||||
/// Stores visited facets (4 first bits)
|
||||
|
|
|
|||
|
|
@ -273,7 +273,7 @@ private:
|
|||
#ifdef CGAL_INTRUSIVE_LIST
|
||||
Cell_handle next_intrusive_, previous_intrusive_;
|
||||
#endif
|
||||
std::size_t time_stamp_ = std::size_t(-1);
|
||||
std::size_t time_stamp_ = std::size_t(-2);
|
||||
|
||||
}; // end class Mesh_cell_base_3
|
||||
|
||||
|
|
|
|||
|
|
@ -41,10 +41,9 @@ private:
|
|||
typedef CGAL::HalfedgeDS_vertex_base<Refs, Tag, Point> Pdv_base;
|
||||
|
||||
Set_of_indices indices;
|
||||
std::size_t time_stamp_ = std::size_t(-1);
|
||||
|
||||
std::size_t time_stamp_ = std::size_t(-2);
|
||||
public:
|
||||
int nb_of_feature_edges;
|
||||
int nb_of_feature_edges = 0;
|
||||
|
||||
bool is_corner() const {
|
||||
return nb_of_feature_edges > 2;
|
||||
|
|
@ -85,8 +84,8 @@ public:
|
|||
return indices;
|
||||
}
|
||||
|
||||
Mesh_polyhedron_vertex() : Pdv_base(), nb_of_feature_edges(0) {}
|
||||
Mesh_polyhedron_vertex(const Point& p) : Pdv_base(p), nb_of_feature_edges(0) {}
|
||||
Mesh_polyhedron_vertex() = default;
|
||||
Mesh_polyhedron_vertex(const Point& p) : Pdv_base(p) {}
|
||||
};
|
||||
|
||||
template <class Refs, class Tprev, class Tvertex, class Tface>
|
||||
|
|
@ -95,7 +94,7 @@ public CGAL::HalfedgeDS_halfedge_base<Refs,Tprev,Tvertex,Tface>
|
|||
{
|
||||
private:
|
||||
bool feature_edge;
|
||||
std::size_t time_stamp_ = std::size_t(-1);
|
||||
std::size_t time_stamp_ = std::size_t(-2);
|
||||
|
||||
public:
|
||||
|
||||
|
|
@ -143,7 +142,7 @@ public CGAL::HalfedgeDS_face_base<Refs,T_,Pln_>
|
|||
{
|
||||
private:
|
||||
Patch_id_ patch_id_;
|
||||
std::size_t time_stamp_ = std::size_t(-1);
|
||||
std::size_t time_stamp_ = std::size_t(-2);
|
||||
|
||||
public:
|
||||
|
||||
|
|
|
|||
|
|
@ -250,7 +250,7 @@ private:
|
|||
Vertex_handle next_intrusive_;
|
||||
Vertex_handle previous_intrusive_;
|
||||
#endif
|
||||
std::size_t time_stamp_ = std::size_t(-1);
|
||||
std::size_t time_stamp_ = std::size_t(-2);
|
||||
public:
|
||||
|
||||
friend std::istream& operator>>(std::istream &is, Mesh_vertex_3& v)
|
||||
|
|
|
|||
|
|
@ -47,18 +47,7 @@ public:
|
|||
|
||||
public:
|
||||
// Constructors
|
||||
Compact_simplicial_mesh_cell_3() {}
|
||||
|
||||
Compact_simplicial_mesh_cell_3(const Compact_simplicial_mesh_cell_3& rhs)
|
||||
: N(rhs.N)
|
||||
, V(rhs.V)
|
||||
, time_stamp_(rhs.time_stamp_)
|
||||
, subdomain_index_(rhs.subdomain_index_)
|
||||
{
|
||||
for(int i=0; i <4; i++){
|
||||
surface_index_table_[i] = rhs.surface_index_table_[i];
|
||||
}
|
||||
}
|
||||
Compact_simplicial_mesh_cell_3() = default;
|
||||
|
||||
Compact_simplicial_mesh_cell_3(Vertex_handle v0,
|
||||
Vertex_handle v1,
|
||||
|
|
@ -277,7 +266,7 @@ private:
|
|||
std::array<Cell_handle, 4> N;
|
||||
std::array<Vertex_handle, 4> V;
|
||||
|
||||
std::size_t time_stamp_ = std::size_t(-1);
|
||||
std::size_t time_stamp_ = std::size_t(-2);
|
||||
|
||||
// The index of the cell of the input complex that contains me
|
||||
Subdomain_index subdomain_index_ = {};
|
||||
|
|
|
|||
|
|
@ -96,7 +96,7 @@ public:
|
|||
};
|
||||
|
||||
public:
|
||||
Simplicial_mesh_cell_base_3() {}
|
||||
Simplicial_mesh_cell_base_3() = default;
|
||||
|
||||
Simplicial_mesh_cell_base_3(const Simplicial_mesh_cell_base_3& rhs)
|
||||
: Cb(static_cast<const Cb&>(rhs)),
|
||||
|
|
@ -189,7 +189,7 @@ private:
|
|||
/// Stores surface_index for each facet of the cell
|
||||
std::array<Surface_patch_index, 4> surface_index_table_ = {};
|
||||
|
||||
std::size_t time_stamp_ = std::size_t(-1);
|
||||
std::size_t time_stamp_ = std::size_t(-2);
|
||||
|
||||
// The index of the cell of the input complex that contains me
|
||||
Subdomain_index subdomain_index_ = {};
|
||||
|
|
|
|||
|
|
@ -217,7 +217,7 @@ private:
|
|||
// that contains me. Negative values are a marker for special vertices.
|
||||
short dimension_;
|
||||
bool cache_validity;
|
||||
std::size_t time_stamp_ = std::size_t(-1);
|
||||
std::size_t time_stamp_ = std::size_t(-2);
|
||||
|
||||
public:
|
||||
friend std::istream& operator>>(std::istream& is,
|
||||
|
|
|
|||
|
|
@ -18,7 +18,6 @@ template <typename Has_timestamp_ = CGAL::Tag_true>
|
|||
struct Node_1
|
||||
: public CGAL::Compact_container_base
|
||||
{
|
||||
Node_1() {}
|
||||
bool operator==(const Node_1 &) const { return true; }
|
||||
bool operator!=(const Node_1 &) const { return false; }
|
||||
bool operator< (const Node_1 &) const { return false; }
|
||||
|
|
@ -49,7 +48,7 @@ struct Node_1
|
|||
}
|
||||
///@}
|
||||
int m_erase_counter;
|
||||
std::size_t time_stamp_ = std::size_t(-1);
|
||||
std::size_t time_stamp_ = std::size_t(-2);
|
||||
};
|
||||
|
||||
class Node_2
|
||||
|
|
|
|||
|
|
@ -32,7 +32,6 @@ int main()
|
|||
struct Node_1
|
||||
: public CGAL::Compact_container_base
|
||||
{
|
||||
Node_1() {}
|
||||
bool operator==(const Node_1 &) const { return true; }
|
||||
bool operator!=(const Node_1 &) const { return false; }
|
||||
bool operator< (const Node_1 &) const { return false; }
|
||||
|
|
@ -45,7 +44,7 @@ struct Node_1
|
|||
void set_time_stamp(const std::size_t& ts) {
|
||||
time_stamp_ = ts;
|
||||
}
|
||||
std::size_t time_stamp_ = std::size_t(-1);
|
||||
std::size_t time_stamp_ = std::size_t(-2);
|
||||
};
|
||||
|
||||
class Node_2
|
||||
|
|
|
|||
Loading…
Reference in New Issue