From 9cc17dc935d5fa2599a2748e399ef09f40918310 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mael=20Rouxel-Labb=C3=A9?= Date: Thu, 1 Jun 2017 11:26:05 +0200 Subject: [PATCH] Renamed uses of invalidate_circumcenter() in accordance with the modified concept --- Mesh_3/include/CGAL/Compact_mesh_cell_base_3.h | 8 ++++---- Mesh_3/include/CGAL/Mesh_3/C3T3_helpers.h | 2 +- Mesh_3/include/CGAL/Mesh_3/Slivers_exuder.h | 2 +- ...triangulation_cell_base_with_weighted_circumcenter_3.h | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Mesh_3/include/CGAL/Compact_mesh_cell_base_3.h b/Mesh_3/include/CGAL/Compact_mesh_cell_base_3.h index 27278600e90..bc74f11819d 100644 --- a/Mesh_3/include/CGAL/Compact_mesh_cell_base_3.h +++ b/Mesh_3/include/CGAL/Compact_mesh_cell_base_3.h @@ -250,7 +250,7 @@ public: typedef const Point* Point_const_iterator; public: - void invalidate_circumcenter() const + void invalidate_weighted_circumcenter_cache() const { if (circumcenter_) { delete circumcenter_; @@ -457,20 +457,20 @@ public: void set_vertex(int i, Vertex_handle v) { CGAL_triangulation_precondition( i >= 0 && i <= 3); - invalidate_circumcenter(); + invalidate_weighted_circumcenter_cache(); V[i] = v; } void set_vertices() { - invalidate_circumcenter(); + invalidate_weighted_circumcenter_cache(); V[0] = V[1] = V[2] = V[3] = Vertex_handle(); } void set_vertices(Vertex_handle v0, Vertex_handle v1, Vertex_handle v2, Vertex_handle v3) { - invalidate_circumcenter(); + invalidate_weighted_circumcenter_cache(); V[0] = v0; V[1] = v1; V[2] = v2; diff --git a/Mesh_3/include/CGAL/Mesh_3/C3T3_helpers.h b/Mesh_3/include/CGAL/Mesh_3/C3T3_helpers.h index debd07baa29..dcf78307d39 100644 --- a/Mesh_3/include/CGAL/Mesh_3/C3T3_helpers.h +++ b/Mesh_3/include/CGAL/Mesh_3/C3T3_helpers.h @@ -2143,7 +2143,7 @@ private: CellForwardIterator cells_end) const { while(cells_begin != cells_end) { - (*cells_begin)->invalidate_circumcenter(); + (*cells_begin)->invalidate_weighted_circumcenter_cache(); ++cells_begin; } } diff --git a/Mesh_3/include/CGAL/Mesh_3/Slivers_exuder.h b/Mesh_3/include/CGAL/Mesh_3/Slivers_exuder.h index 9a873828de2..84f4e4f1a12 100644 --- a/Mesh_3/include/CGAL/Mesh_3/Slivers_exuder.h +++ b/Mesh_3/include/CGAL/Mesh_3/Slivers_exuder.h @@ -1463,7 +1463,7 @@ restore_cells_and_boundary_facets( cit != new_cells.end(); ++cit) { - (*cit)->invalidate_circumcenter(); + (*cit)->invalidate_weighted_circumcenter_cache(); const int index = (*cit)->index(new_vertex); const Facet new_facet = std::make_pair(*cit, index); const Facet new_facet_from_outside = tr_.mirror_facet(new_facet); diff --git a/Triangulation_3/include/CGAL/Regular_triangulation_cell_base_with_weighted_circumcenter_3.h b/Triangulation_3/include/CGAL/Regular_triangulation_cell_base_with_weighted_circumcenter_3.h index c78680fb4e6..3bb30b73267 100644 --- a/Triangulation_3/include/CGAL/Regular_triangulation_cell_base_with_weighted_circumcenter_3.h +++ b/Triangulation_3/include/CGAL/Regular_triangulation_cell_base_with_weighted_circumcenter_3.h @@ -45,7 +45,7 @@ class Regular_triangulation_cell_base_with_weighted_circumcenter_3 mutable Point_3* weighted_circumcenter_; public: - void invalidate_circumcenter() + void invalidate_weighted_circumcenter_cache() { if (weighted_circumcenter_) { delete weighted_circumcenter_; @@ -109,20 +109,20 @@ public: // but there's not much we can do for this now. void set_vertex(int i, Vertex_handle v) { - invalidate_circumcenter(); + invalidate_weighted_circumcenter_cache(); Cb::set_vertex(i, v); } void set_vertices() { - invalidate_circumcenter(); + invalidate_weighted_circumcenter_cache(); Cb::set_vertices(); } void set_vertices(Vertex_handle v0, Vertex_handle v1, Vertex_handle v2, Vertex_handle v3) { - invalidate_circumcenter(); + invalidate_weighted_circumcenter_cache(); Cb::set_vertices(v0, v1, v2, v3); }