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

..._on_tetrahedral_mesh_boundary_3 -> ..._in_tetrahedral_mesh_boundary_3

This commit is contained in:
Sébastien Loriot 2016-07-25 11:58:06 +02:00
parent 3965967cf6
commit 9e5ac35277
8 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Generator/doc/Generator/CGAL/point_generators_2.h
View File

@ -370,7 +370,7 @@ typedef const Point_2& reference;
\sa `CGAL::Random_points_in_triangle_3<Point_2, Creator>` \sa `CGAL::Random_points_in_triangle_3<Point_2, Creator>`
\sa `CGAL::Random_points_in_tetrahedron_3<Point_2, Creator>` \sa `CGAL::Random_points_in_tetrahedron_3<Point_2, Creator>`
\sa`CGAL::Random_points_in_triangle_mesh_3<Point_3, TriangleMesh>` \sa`CGAL::Random_points_in_triangle_mesh_3<Point_3, TriangleMesh>`
\sa`CGAL::Random_points_on_tetrahedral_mesh_boundary_3<C3T3>` \sa`CGAL::Random_points_in_tetrahedral_mesh_boundary_3<C3T3>`
\sa`CGAL::Random_points_in_tetrahedral_mesh_3<C3T3>` \sa`CGAL::Random_points_in_tetrahedral_mesh_3<C3T3>`
\sa `CGAL::Random_points_in_triangles_3<Point_3>` \sa `CGAL::Random_points_in_triangles_3<Point_3>`
\sa `CGAL::Random_points_in_triangles_2<Point_2>` \sa `CGAL::Random_points_in_triangles_2<Point_2>`
@ -440,7 +440,7 @@ default_random);
\sa `CGAL::Random_points_in_triangle_3<Point_2, Creator>` \sa `CGAL::Random_points_in_triangle_3<Point_2, Creator>`
\sa `CGAL::Random_points_in_tetrahedron_3<Point_2, Creator>` \sa `CGAL::Random_points_in_tetrahedron_3<Point_2, Creator>`
\sa `CGAL::Random_points_in_triangle_mesh_3<Point_3, TriangleMesh>` \sa `CGAL::Random_points_in_triangle_mesh_3<Point_3, TriangleMesh>`
\sa `CGAL::Random_points_on_tetrahedral_mesh_boundary_3<C3T3>` \sa `CGAL::Random_points_in_tetrahedral_mesh_boundary_3<C3T3>`
\sa `CGAL::Random_points_in_tetrahedral_mesh_3<C3T3>` \sa `CGAL::Random_points_in_tetrahedral_mesh_3<C3T3>`
\sa `CGAL::Random_points_in_triangles_3<Point_3>` \sa `CGAL::Random_points_in_triangles_3<Point_3>`
\sa `std::random_shuffle` \sa `std::random_shuffle`

14
Generator/doc/Generator/CGAL/point_generators_3.h
View File

@ -352,7 +352,7 @@ The triangle range must be valid and unchanged while the iterator is used.
\sa `CGAL::Random_points_in_triangle_3<Point_2, Creator>` \sa `CGAL::Random_points_in_triangle_3<Point_2, Creator>`
\sa `CGAL::Random_points_in_tetrahedron_3<Point_2, Creator>` \sa `CGAL::Random_points_in_tetrahedron_3<Point_2, Creator>`
\sa `CGAL::Random_points_in_triangle_mesh_3<Point_3, TriangleMesh>` \sa `CGAL::Random_points_in_triangle_mesh_3<Point_3, TriangleMesh>`
\sa `CGAL::Random_points_on_tetrahedral_mesh_boundary_3<C3T3>` \sa `CGAL::Random_points_in_tetrahedral_mesh_boundary_3<C3T3>`
\sa `CGAL::Random_points_in_tetrahedral_mesh_3<C3T3>` \sa `CGAL::Random_points_in_tetrahedral_mesh_3<C3T3>`
\sa `CGAL::Random_points_in_triangles_2<Point_2>` \sa `CGAL::Random_points_in_triangles_2<Point_2>`
\sa `std::random_shuffle` \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<Point_3, Creator>` \sa `CGAL::Random_points_in_triangle_3<Point_3, Creator>`
\sa `CGAL::Random_points_on_sphere_3<Point_3, Creator>` \sa `CGAL::Random_points_on_sphere_3<Point_3, Creator>`
\sa `CGAL::Random_points_in_triangle_mesh_2<Point_2, Triangulation>` \sa `CGAL::Random_points_in_triangle_mesh_2<Point_2, Triangulation>`
\sa `CGAL::Random_points_on_tetrahedral_mesh_boundary_3<C3T3>` \sa `CGAL::Random_points_in_tetrahedral_mesh_boundary_3<C3T3>`
\sa `CGAL::Random_points_in_tetrahedral_mesh_3<C3T3>` \sa `CGAL::Random_points_in_tetrahedral_mesh_3<C3T3>`
\sa `CGAL::Random_points_in_triangles_2<Point_2>` \sa `CGAL::Random_points_in_triangles_2<Point_2>`
\sa `CGAL::Random_points_in_triangles_3<Point_3>` \sa `CGAL::Random_points_in_triangles_3<Point_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`. 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. 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 C3T3> template <class C3T3>
class Random_points_on_tetrahedral_mesh_boundary_3 { class Random_points_in_tetrahedral_mesh_boundary_3 {
public: public:
/// \name Types /// \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. 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 */ } /* 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<Point_3, Creator>` \sa `CGAL::Random_points_on_sphere_3<Point_3, Creator>`
\sa `CGAL::Random_points_in_triangle_mesh_3<Point_3, TriangleMesh>` \sa `CGAL::Random_points_in_triangle_mesh_3<Point_3, TriangleMesh>`
\sa `CGAL::Random_points_in_triangle_mesh_2<Point_2, Triangulation>` \sa `CGAL::Random_points_in_triangle_mesh_2<Point_2, Triangulation>`
\sa `CGAL::Random_points_on_tetrahedral_mesh_boundary_3<C3T3>` \sa `CGAL::Random_points_in_tetrahedral_mesh_boundary_3<C3T3>`
\sa `CGAL::Random_points_in_triangles_2<Point_2>` \sa `CGAL::Random_points_in_triangles_2<Point_2>`
\sa `CGAL::Random_points_in_triangles_3<Point_3>` \sa `CGAL::Random_points_in_triangles_3<Point_3>`
\sa `std::random_shuffle` \sa `std::random_shuffle`

2
Generator/doc/Generator/Generator.txt
View File

@ -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 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`), (`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 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 For generating 3D grid points, we provide the function
`points_on_cube_grid_3()` that writes to `points_on_cube_grid_3()` that writes to
an output iterator. an output iterator.

2
Generator/doc/Generator/PackageDescription.txt
View File

@ -69,7 +69,7 @@ achieve random permutations for otherwise regular generators (
- `CGAL::Random_points_on_circle_2<Point_2, Creator>` - `CGAL::Random_points_on_circle_2<Point_2, Creator>`
- `CGAL::Random_points_on_triangle_mesh_2<Point_2, Triangulation>` - `CGAL::Random_points_on_triangle_mesh_2<Point_2, Triangulation>`
- `CGAL::Random_points_in_triangle_mesh_3<Point_3, Mesh>` - `CGAL::Random_points_in_triangle_mesh_3<Point_3, Mesh>`
- `CGAL::Random_points_on_tetrahedral_mesh_boundary_3<C3t3>` - `CGAL::Random_points_in_tetrahedral_mesh_boundary_3<C3t3>`
- `CGAL::Random_points_on_segment_2<Point_2, Creator>` - `CGAL::Random_points_on_segment_2<Point_2, Creator>`
- `CGAL::Random_points_on_sphere_3<Point_3, Creator>` - `CGAL::Random_points_on_sphere_3<Point_3, Creator>`
- `CGAL::Random_points_on_sphere_d<Point_d>` - `CGAL::Random_points_on_sphere_d<Point_d>`

2
Generator/examples/Generator/random_points_on_tetrahedral_mesh_3.cpp
View File

@ -52,7 +52,7 @@ int main()
C3t3 c3t3 = CGAL::make_mesh_3<C3t3>(domain, criteria, no_perturb(), no_exude()); C3t3 c3t3 = CGAL::make_mesh_3<C3t3>(domain, criteria, no_perturb(), no_exude());
// Create the generator, input is the C3t3 c3t3 // Create the generator, input is the C3t3 c3t3
Random_points_on_tetrahedral_mesh_boundary_3<C3t3> Random_points_in_tetrahedral_mesh_boundary_3<C3t3>
g(c3t3); g(c3t3);
// Get 100 random points in cdt // Get 100 random points in cdt
CGAL::cpp11::copy_n( g, 100, std::back_inserter(points)); CGAL::cpp11::copy_n( g, 100, std::back_inserter(points));

6
Generator/include/CGAL/point_generators_3.h
View File

@ -403,7 +403,7 @@ public:
}//end namespace internal }//end namespace internal
template <class C3t3> template <class C3t3>
struct Random_points_on_tetrahedral_mesh_boundary_3 struct Random_points_in_tetrahedral_mesh_boundary_3
: public Generic_random_point_generator< : public Generic_random_point_generator<
std::pair<typename C3t3::Triangulation::Cell_handle, int>, std::pair<typename C3t3::Triangulation::Cell_handle, int>,
internal::Triangle_from_face_C3t3<typename C3t3::Triangulation>, internal::Triangle_from_face_C3t3<typename C3t3::Triangulation>,
@ -417,10 +417,10 @@ struct Random_points_on_tetrahedral_mesh_boundary_3
typename C3t3::Point> Base; typename C3t3::Point> Base;
typedef std::pair<typename C3t3::Triangulation::Cell_handle, int> Id; typedef std::pair<typename C3t3::Triangulation::Cell_handle, int> Id;
typedef typename C3t3::Point result_type; typedef typename C3t3::Point result_type;
typedef Random_points_on_tetrahedral_mesh_boundary_3<C3t3> This; typedef Random_points_in_tetrahedral_mesh_boundary_3<C3t3> 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(), : Base( make_range( c3t3.facets_in_complex_begin(),
c3t3.facets_in_complex_end()), c3t3.facets_in_complex_end()),
internal::Triangle_from_face_C3t3<typename C3t3::Triangulation>(), internal::Triangle_from_face_C3t3<typename C3t3::Triangulation>(),

2
Generator/test/Generator/generic_random_test.cpp
View File

@ -207,7 +207,7 @@ int test_on_c3t3(const Polyhedron& polyhedron)
cell_radius_edge_ratio=3); cell_radius_edge_ratio=3);
// Mesh generation // Mesh generation
C3t3 c3t3 = CGAL::make_mesh_3<C3t3>(domain, criteria, no_perturb(), no_exude()); C3t3 c3t3 = CGAL::make_mesh_3<C3t3>(domain, criteria, no_perturb(), no_exude());
Random_points_on_tetrahedral_mesh_boundary_3<C3t3> Random_points_in_tetrahedral_mesh_boundary_3<C3t3>
g(c3t3); g(c3t3);
CGAL::cpp11::copy_n( g, 300, std::back_inserter(points)); CGAL::cpp11::copy_n( g, 300, std::back_inserter(points));
for (std::size_t i = 0; i<points.size(); ++i) for (std::size_t i = 0; i<points.size(); ++i)

2
Installation/changes.html
View File

@ -161,7 +161,7 @@ and <code>src/</code> directories).
Add point random generators Add point random generators
<ul> <ul>
<li>in a 3D triangle mesh model of the concept <code>FaceListGraph</code> (<code>CGAL::Random_points_in_triangle_mesh_3</code>),</li> <li>in a 3D triangle mesh model of the concept <code>FaceListGraph</code> (<code>CGAL::Random_points_in_triangle_mesh_3</code>),</li>
<li>on the boundary of a tetrahedral mesh (<code>CGAL::Random_points_on_tetrahedral_mesh_boundary</code>),</li> <li>on the boundary of a tetrahedral mesh (<code>CGAL::Random_points_in_tetrahedral_mesh_boundary_3</code>),</li>
<li>in a tetrahedral mesh (<code>CGAL::Random_points_in_tetrahedral_mesh_3</code>),</li> <li>in a tetrahedral mesh (<code>CGAL::Random_points_in_tetrahedral_mesh_3</code>),</li>
<li>in a 2D triangle mesh (<code>CGAL::Random_points_in_triangle_mesh_2</code>),</li> <li>in a 2D triangle mesh (<code>CGAL::Random_points_in_triangle_mesh_2</code>),</li>
<li>in a range of 2D or 3D triangles (<code>CGAL::Random_points_in_triangles_3</code> and <code>CGAL::Random_points_in_triangles_2</code>).</li> <li>in a range of 2D or 3D triangles (<code>CGAL::Random_points_in_triangles_3</code> and <code>CGAL::Random_points_in_triangles_2</code>).</li>