From 457e9d5b00289fb1f8fe73a3313f27cf113dea4a Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Mon, 4 May 2015 16:43:38 +0200 Subject: [PATCH] first changes after Guillaumes review --- ...Advancing_front_surface_reconstruction.txt | 6 +++--- .../Advancing_front_surface_reconstruction.h | 20 +++++++++---------- .../reconstruction_class.cpp | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Advancing_front_surface_reconstruction/doc/Advancing_front_surface_reconstruction/Advancing_front_surface_reconstruction.txt b/Advancing_front_surface_reconstruction/doc/Advancing_front_surface_reconstruction/Advancing_front_surface_reconstruction.txt index ebe14c442e5..5de74e261e8 100644 --- a/Advancing_front_surface_reconstruction/doc/Advancing_front_surface_reconstruction/Advancing_front_surface_reconstruction.txt +++ b/Advancing_front_surface_reconstruction/doc/Advancing_front_surface_reconstruction/Advancing_front_surface_reconstruction.txt @@ -210,14 +210,14 @@ corresponding facets of the underlying 3D Delaunay triangulation. The type of the 2D triangulation data structure describing the reconstructed surface is the nested type -\link Advancing_front_surface_reconstruction::TDS_2 `TDS_2`\endlink. +\link Advancing_front_surface_reconstruction::Triangulation_data_structure_2 `Advancing_front_surface_reconstruction::Triangulation_data_structure_2`\endlink. -The type `TDS_2::Vertex` is model of the +The type `Advancing_front_surface_reconstruction::Triangulation_data_structure_2::Vertex` is model of the concept `TriangulationDataStructure_2::Vertex` and has additionally the method `vertex_3()` that returns an `Advancing_front_surface_reconstruction::Vertex_handle` to the associated 3D vertex. - The type `TDS_2::Face` is model of the concept + The type `Advancing_front_surface_reconstruction::Triangulation_data_structure_2::Face` is model of the concept `TriangulationDataStructure_2::Face` and has additionally the method `facet()` that returns the associated `Advancing_front_surface_reconstruction::Facet`, and a method `is_on_surface()` for testing if a face is part of the reconstructed diff --git a/Advancing_front_surface_reconstruction/doc/Advancing_front_surface_reconstruction/CGAL/Advancing_front_surface_reconstruction.h b/Advancing_front_surface_reconstruction/doc/Advancing_front_surface_reconstruction/CGAL/Advancing_front_surface_reconstruction.h index 8003509269f..7250cf35bdd 100644 --- a/Advancing_front_surface_reconstruction/doc/Advancing_front_surface_reconstruction/CGAL/Advancing_front_surface_reconstruction.h +++ b/Advancing_front_surface_reconstruction/doc/Advancing_front_surface_reconstruction/CGAL/Advancing_front_surface_reconstruction.h @@ -20,15 +20,15 @@ public: /*! The type of the 2D triangulation data structure describing the reconstructed surface. - The type `TDS_2::Vertex` is model of the concept `TriangulationDataStructure_2::Vertex` and has additionally the + The type `Triangulation_data_structure_2::Vertex` is model of the concept `TriangulationDataStructure_2::Vertex` and has additionally the method `vertex_3()` that returns a `Vertex_handle` to the associated 3D vertex. - The type `TDS_2::Face` is model of the concept `TriangulationDataStructure_2::Face` and has additionally the + The type `Triangulation_data_structure_2::Face` is model of the concept `TriangulationDataStructure_2::Face` and has additionally the method `facet()` that returns the associated `Facet`, and a method `bool is_on_surface()` for testing if a face is part of the reconstructed surface or a face incident to a boundary edge. In case the surface has boundaries, the 2D surface has one vertex which is associated to the infinite vertex of the 3D triangulation. */ - typedef unspecified_type TDS_2; + typedef unspecified_type Triangulation_data_structure_2; /*! @@ -108,7 +108,7 @@ Advancing_front_surface_reconstruction(Dt& dt); /// @{ /*! -runs the surface reconstruction function with the default parameters. +runs the surface reconstruction function. \param radius_ratio_bound candidates incident to surface triangles which are not in the beta-wedge are discarded, if the ratio of their radius and the radius of the surface triangle is larger than `radius_ratio_bound`. @@ -122,8 +122,8 @@ runs the surface reconstruction function with the default parameters. /*! returns the reconstructed surface. */ -const TDS_2& -tds_2(); +const Triangulation_data_structure_2& +triangulation_data_structure_2() const; /*! returns the underlying 3D Delaunay triangulation. @@ -165,16 +165,16 @@ bool has_on_surface(Facet f) const; /*! -returns `true` if the facet f is on the surface. +returns `true` if the facet `f2` is on the surface. */ bool -has_on_surface(TDS_2::Face_handle f2) const; +has_on_surface(Triangulation_data_structure_2::Face_handle f2) const; /*! -returns `true` if the facet f is on the surface. +returns `true` if the vertex `v2` is on the surface. */ bool -has_on_surface(TDS_2::Vertex_handle v2) const; +has_on_surface(Triangulation_data_structure_2::Vertex_handle v2) const; /// @} diff --git a/Advancing_front_surface_reconstruction/examples/Advancing_front_surface_reconstruction/reconstruction_class.cpp b/Advancing_front_surface_reconstruction/examples/Advancing_front_surface_reconstruction/reconstruction_class.cpp index acf8569770c..3c47e750ec0 100644 --- a/Advancing_front_surface_reconstruction/examples/Advancing_front_surface_reconstruction/reconstruction_class.cpp +++ b/Advancing_front_surface_reconstruction/examples/Advancing_front_surface_reconstruction/reconstruction_class.cpp @@ -5,7 +5,7 @@ typedef CGAL::Exact_predicates_inexact_constructions_kernel K; typedef CGAL::Advancing_front_surface_reconstruction Reconstruction; typedef Reconstruction::Triangulation_3 Triangulation_3; -typedef Reconstruction::TDS_2 TDS_2; +typedef Reconstruction::Triangulation_data_structure_2 TDS_2; typedef K::Point_3 Point_3; int main()