From 9e5ac35277e65e19fe92d66f875967ccd353e3bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Mon, 25 Jul 2016 11:58:06 +0200 Subject: [PATCH] ..._on_tetrahedral_mesh_boundary_3 -> ..._in_tetrahedral_mesh_boundary_3 --- Generator/doc/Generator/CGAL/point_generators_2.h | 4 ++-- Generator/doc/Generator/CGAL/point_generators_3.h | 14 +++++++------- Generator/doc/Generator/Generator.txt | 2 +- Generator/doc/Generator/PackageDescription.txt | 2 +- .../random_points_on_tetrahedral_mesh_3.cpp | 2 +- Generator/include/CGAL/point_generators_3.h | 6 +++--- Generator/test/Generator/generic_random_test.cpp | 2 +- Installation/changes.html | 2 +- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Generator/doc/Generator/CGAL/point_generators_2.h b/Generator/doc/Generator/CGAL/point_generators_2.h index c8884473416..c8ef665c154 100644 --- a/Generator/doc/Generator/CGAL/point_generators_2.h +++ b/Generator/doc/Generator/CGAL/point_generators_2.h @@ -370,7 +370,7 @@ typedef const Point_2& reference; \sa `CGAL::Random_points_in_triangle_3` \sa `CGAL::Random_points_in_tetrahedron_3` \sa`CGAL::Random_points_in_triangle_mesh_3` - \sa`CGAL::Random_points_on_tetrahedral_mesh_boundary_3` + \sa`CGAL::Random_points_in_tetrahedral_mesh_boundary_3` \sa`CGAL::Random_points_in_tetrahedral_mesh_3` \sa `CGAL::Random_points_in_triangles_3` \sa `CGAL::Random_points_in_triangles_2` @@ -440,7 +440,7 @@ default_random); \sa `CGAL::Random_points_in_triangle_3` \sa `CGAL::Random_points_in_tetrahedron_3` \sa `CGAL::Random_points_in_triangle_mesh_3` - \sa `CGAL::Random_points_on_tetrahedral_mesh_boundary_3` + \sa `CGAL::Random_points_in_tetrahedral_mesh_boundary_3` \sa `CGAL::Random_points_in_tetrahedral_mesh_3` \sa `CGAL::Random_points_in_triangles_3` \sa `std::random_shuffle` diff --git a/Generator/doc/Generator/CGAL/point_generators_3.h b/Generator/doc/Generator/CGAL/point_generators_3.h index cdba22c0799..c6792a144e1 100644 --- a/Generator/doc/Generator/CGAL/point_generators_3.h +++ b/Generator/doc/Generator/CGAL/point_generators_3.h @@ -352,7 +352,7 @@ The triangle range must be valid and unchanged while the iterator is used. \sa `CGAL::Random_points_in_triangle_3` \sa `CGAL::Random_points_in_tetrahedron_3` \sa `CGAL::Random_points_in_triangle_mesh_3` -\sa `CGAL::Random_points_on_tetrahedral_mesh_boundary_3` +\sa `CGAL::Random_points_in_tetrahedral_mesh_boundary_3` \sa `CGAL::Random_points_in_tetrahedral_mesh_3` \sa `CGAL::Random_points_in_triangles_2` \sa `std::random_shuffle` @@ -422,7 +422,7 @@ The triangle mesh must be valid and unchanged while the iterator is used. \sa `CGAL::Random_points_in_triangle_3` \sa `CGAL::Random_points_on_sphere_3` \sa `CGAL::Random_points_in_triangle_mesh_2` -\sa `CGAL::Random_points_on_tetrahedral_mesh_boundary_3` +\sa `CGAL::Random_points_in_tetrahedral_mesh_boundary_3` \sa `CGAL::Random_points_in_tetrahedral_mesh_3` \sa `CGAL::Random_points_in_triangles_2` \sa `CGAL::Random_points_in_triangles_3` @@ -482,7 +482,7 @@ namespace CGAL { /*! -The class `Random_points_on_tetrahedral_mesh_boundary_3` is an input iterator creating points uniformly +The class `Random_points_in_tetrahedral_mesh_boundary_3` is an input iterator creating points uniformly distributed on the boundary of a tetrahedral mesh of type `Mesh_complex_3_in_triangulation_3`. The tetrahedral mesh must be valid and unchanged while the iterator is used. @@ -505,7 +505,7 @@ C3T3 is a model of `Mesh_complex_3_in_triangulation_3` */ template -class Random_points_on_tetrahedral_mesh_boundary_3 { +class Random_points_in_tetrahedral_mesh_boundary_3 { public: /// \name Types @@ -543,11 +543,11 @@ Creates an input iterator `g` generating points of type `Weighted_point_3` unif distributed on the mesh. Each triangle has a probability to be chosen to hold the point depending on its area. */ -Random_points_on_tetrahedral_mesh_boundary_3( C3T3& c3t3,Random& rnd = default_random); +Random_points_in_tetrahedral_mesh_boundary_3( C3T3& c3t3,Random& rnd = default_random); /// @} -}; /* end Random_points_on_tetrahedral_mesh_boundary_3 */ +}; /* end Random_points_in_tetrahedral_mesh_boundary_3 */ } /* end namespace CGAL */ @@ -571,7 +571,7 @@ C3T3 is a model of `Mesh_complex_3_in_triangulation_3` \sa `CGAL::Random_points_on_sphere_3` \sa `CGAL::Random_points_in_triangle_mesh_3` \sa `CGAL::Random_points_in_triangle_mesh_2` -\sa `CGAL::Random_points_on_tetrahedral_mesh_boundary_3` +\sa `CGAL::Random_points_in_tetrahedral_mesh_boundary_3` \sa `CGAL::Random_points_in_triangles_2` \sa `CGAL::Random_points_in_triangles_3` \sa `std::random_shuffle` diff --git a/Generator/doc/Generator/Generator.txt b/Generator/doc/Generator/Generator.txt index e400aaddbb4..138c4a7a7a5 100644 --- a/Generator/doc/Generator/Generator.txt +++ b/Generator/doc/Generator/Generator.txt @@ -45,7 +45,7 @@ in a range of triangles (`Random_points_in_triangles_3`), in a tetrahedron (`Random_points_in_tetrahedron_3`), in a cube (`Random_points_in_cube_3`), on the boundary of a sphere (`Random_points_on_sphere_3`), in a triangle mesh (`Random_points_in_triangle_mesh_3`), in a tetrahedron mesh (`Random_points_in_tetrahedral_mesh_3`), and on the boundary -of a tetrahedron mesh (`Random_points_on_tetrahedral_mesh_boundary_3`). +of a tetrahedron mesh (`Random_points_in_tetrahedral_mesh_boundary_3`). For generating 3D grid points, we provide the function `points_on_cube_grid_3()` that writes to an output iterator. diff --git a/Generator/doc/Generator/PackageDescription.txt b/Generator/doc/Generator/PackageDescription.txt index 586c953b288..c3623ead3e8 100644 --- a/Generator/doc/Generator/PackageDescription.txt +++ b/Generator/doc/Generator/PackageDescription.txt @@ -69,7 +69,7 @@ achieve random permutations for otherwise regular generators ( - `CGAL::Random_points_on_circle_2` - `CGAL::Random_points_on_triangle_mesh_2` - `CGAL::Random_points_in_triangle_mesh_3` -- `CGAL::Random_points_on_tetrahedral_mesh_boundary_3` +- `CGAL::Random_points_in_tetrahedral_mesh_boundary_3` - `CGAL::Random_points_on_segment_2` - `CGAL::Random_points_on_sphere_3` - `CGAL::Random_points_on_sphere_d` diff --git a/Generator/examples/Generator/random_points_on_tetrahedral_mesh_3.cpp b/Generator/examples/Generator/random_points_on_tetrahedral_mesh_3.cpp index a64d6380b1d..b69a3b72d46 100644 --- a/Generator/examples/Generator/random_points_on_tetrahedral_mesh_3.cpp +++ b/Generator/examples/Generator/random_points_on_tetrahedral_mesh_3.cpp @@ -52,7 +52,7 @@ int main() C3t3 c3t3 = CGAL::make_mesh_3(domain, criteria, no_perturb(), no_exude()); // Create the generator, input is the C3t3 c3t3 - Random_points_on_tetrahedral_mesh_boundary_3 + Random_points_in_tetrahedral_mesh_boundary_3 g(c3t3); // Get 100 random points in cdt CGAL::cpp11::copy_n( g, 100, std::back_inserter(points)); diff --git a/Generator/include/CGAL/point_generators_3.h b/Generator/include/CGAL/point_generators_3.h index 28c091eec58..dc9378467ec 100644 --- a/Generator/include/CGAL/point_generators_3.h +++ b/Generator/include/CGAL/point_generators_3.h @@ -403,7 +403,7 @@ public: }//end namespace internal template -struct Random_points_on_tetrahedral_mesh_boundary_3 +struct Random_points_in_tetrahedral_mesh_boundary_3 : public Generic_random_point_generator< std::pair, internal::Triangle_from_face_C3t3, @@ -417,10 +417,10 @@ struct Random_points_on_tetrahedral_mesh_boundary_3 typename C3t3::Point> Base; typedef std::pair Id; typedef typename C3t3::Point result_type; - typedef Random_points_on_tetrahedral_mesh_boundary_3 This; + typedef Random_points_in_tetrahedral_mesh_boundary_3 This; - Random_points_on_tetrahedral_mesh_boundary_3( C3t3& c3t3,Random& rnd = default_random) + Random_points_in_tetrahedral_mesh_boundary_3( C3t3& c3t3,Random& rnd = default_random) : Base( make_range( c3t3.facets_in_complex_begin(), c3t3.facets_in_complex_end()), internal::Triangle_from_face_C3t3(), diff --git a/Generator/test/Generator/generic_random_test.cpp b/Generator/test/Generator/generic_random_test.cpp index 41714667300..61c600feaa1 100644 --- a/Generator/test/Generator/generic_random_test.cpp +++ b/Generator/test/Generator/generic_random_test.cpp @@ -207,7 +207,7 @@ int test_on_c3t3(const Polyhedron& polyhedron) cell_radius_edge_ratio=3); // Mesh generation C3t3 c3t3 = CGAL::make_mesh_3(domain, criteria, no_perturb(), no_exude()); - Random_points_on_tetrahedral_mesh_boundary_3 + Random_points_in_tetrahedral_mesh_boundary_3 g(c3t3); CGAL::cpp11::copy_n( g, 300, std::back_inserter(points)); for (std::size_t i = 0; isrc/ directories). Add point random generators
  • in a 3D triangle mesh model of the concept FaceListGraph (CGAL::Random_points_in_triangle_mesh_3),
    • -
  • on the boundary of a tetrahedral mesh (CGAL::Random_points_on_tetrahedral_mesh_boundary),
    • +
  • on the boundary of a tetrahedral mesh (CGAL::Random_points_in_tetrahedral_mesh_boundary_3),
  • in a tetrahedral mesh (CGAL::Random_points_in_tetrahedral_mesh_3),
  • in a 2D triangle mesh (CGAL::Random_points_in_triangle_mesh_2),
  • in a range of 2D or 3D triangles (CGAL::Random_points_in_triangles_3 and CGAL::Random_points_in_triangles_2).