diff --git a/Alpha_shapes_2/doc/Alpha_shapes_2/Concepts/WeightedAlphaShapeTraits_2.h b/Alpha_shapes_2/doc/Alpha_shapes_2/Concepts/WeightedAlphaShapeTraits_2.h index 06efa03211c..de2ffb030dd 100644 --- a/Alpha_shapes_2/doc/Alpha_shapes_2/Concepts/WeightedAlphaShapeTraits_2.h +++ b/Alpha_shapes_2/doc/Alpha_shapes_2/Concepts/WeightedAlphaShapeTraits_2.h @@ -5,13 +5,13 @@ The concept `WeightedAlphaShapeTraits_2` describes the requirements for the geometric traits class -of the underlying Regular triangulation of a weighted alpha shape. +of the underlying regular triangulation of a weighted alpha shape. \cgalRefines `RegularTriangulationTraits_2` In addition to the requirements described in the concept ::RegularTriangulationTraits_2, the geometric traits class of a -Regular triangulation plugged in a basic alpha shapes provides the +regular triangulation plugged in a basic alpha shapes provides the following. \cgalHasModel All models of `Kernel`. diff --git a/Alpha_shapes_3/doc/Alpha_shapes_3/CGAL/Alpha_shape_cell_base_3.h b/Alpha_shapes_3/doc/Alpha_shapes_3/CGAL/Alpha_shape_cell_base_3.h index 466e1f305dc..894644e3246 100644 --- a/Alpha_shapes_3/doc/Alpha_shapes_3/CGAL/Alpha_shape_cell_base_3.h +++ b/Alpha_shapes_3/doc/Alpha_shapes_3/CGAL/Alpha_shape_cell_base_3.h @@ -16,7 +16,7 @@ to the `Alpha_shape_3` class. \link Tag_true `Tag_true`\endlink, triggers exact comparisons between alpha values. See the description provided in the documentation of `Alpha_shape_3` for more details. The default value is \link Tag_false `Tag_false`\endlink. \tparam WeightedTag is used only if `ExactAlphaComparisonTag` is \link Tag_true `Tag_true`\endlink. It -must be \link Tag_true `Tag_true`\endlink if the underlying triangulation of the alpha shape to be used is a Regular triangulation +must be \link Tag_true `Tag_true`\endlink if the underlying triangulation of the alpha shape to be used is a regular triangulation and \link Tag_false `Tag_false`\endlink otherwise. The default is \link Tag_false `Tag_false`\endlink. \cgalModels `AlphaShapeCell_3` diff --git a/Alpha_shapes_3/doc/Alpha_shapes_3/CGAL/Alpha_shape_vertex_base_3.h b/Alpha_shapes_3/doc/Alpha_shapes_3/CGAL/Alpha_shape_vertex_base_3.h index 34b50cb01ce..48a900c3234 100644 --- a/Alpha_shapes_3/doc/Alpha_shapes_3/CGAL/Alpha_shape_vertex_base_3.h +++ b/Alpha_shapes_3/doc/Alpha_shapes_3/CGAL/Alpha_shape_vertex_base_3.h @@ -16,7 +16,7 @@ to the `Alpha_shape_3` class. \link Tag_true `Tag_true`\endlink, triggers exact comparisons between alpha values. See the description provided in the documentation of `Alpha_shape_3` for more details. The default value is \link Tag_false `Tag_false`\endlink. \tparam WeightedTag is used only if `ExactAlphaComparisonTag` is \link Tag_true `Tag_true`\endlink. It -must be \link Tag_true `Tag_true`\endlink if the underlying triangulation of the alpha shape to be used is a Regular triangulation +must be \link Tag_true `Tag_true`\endlink if the underlying triangulation of the alpha shape to be used is a regular triangulation and \link Tag_false `Tag_false`\endlink otherwise. The default is \link Tag_false `Tag_false`\endlink. \cgalModels `AlphaShapeVertex_3` diff --git a/Alpha_shapes_3/doc/Alpha_shapes_3/Concepts/FixedWeightedAlphaShapeTraits_3.h b/Alpha_shapes_3/doc/Alpha_shapes_3/Concepts/FixedWeightedAlphaShapeTraits_3.h index 12bdfc9d607..3b4e87d983c 100644 --- a/Alpha_shapes_3/doc/Alpha_shapes_3/Concepts/FixedWeightedAlphaShapeTraits_3.h +++ b/Alpha_shapes_3/doc/Alpha_shapes_3/Concepts/FixedWeightedAlphaShapeTraits_3.h @@ -4,13 +4,13 @@ \cgalConcept The concept `FixedWeightedAlphaShapeTraits_3` describes the requirements -for the geometric traits class of the underlying Regular triangulation of a weighted alpha shape with fixed alpha value. +for the geometric traits class of the underlying regular triangulation of a weighted alpha shape with fixed alpha value. \cgalRefines `RegularTriangulationTraits_3` In addition to the requirements described in the concept ::RegularTriangulationTraits_3, the geometric traits class of a -Regular triangulation plugged in a weighted alpha shape with fixed +regular triangulation plugged in a weighted alpha shape with fixed alpha value provides the following. \cgalHasModel All models of `Kernel`. diff --git a/Alpha_shapes_3/doc/Alpha_shapes_3/Concepts/WeightedAlphaShapeTraits_3.h b/Alpha_shapes_3/doc/Alpha_shapes_3/Concepts/WeightedAlphaShapeTraits_3.h index 988aed6ad6e..78d289b2e61 100644 --- a/Alpha_shapes_3/doc/Alpha_shapes_3/Concepts/WeightedAlphaShapeTraits_3.h +++ b/Alpha_shapes_3/doc/Alpha_shapes_3/Concepts/WeightedAlphaShapeTraits_3.h @@ -5,13 +5,13 @@ The concept `WeightedAlphaShapeTraits_3` describes the requirements for the geometric traits class -of the underlying Regular triangulation of a weighted alpha shape. +of the underlying regular triangulation of a weighted alpha shape. \cgalRefines `RegularTriangulationTraits_3` In addition to the requirements described in the concept ::RegularTriangulationTraits_3, the geometric traits class of a -Regular triangulation plugged in a basic alpha shapes provides the +regular triangulation plugged in a basic alpha shapes provides the following. \cgalHasModel All models of `Kernel`. diff --git a/CGAL_ipelets/demo/CGAL_ipelets/triangulation.cpp b/CGAL_ipelets/demo/CGAL_ipelets/triangulation.cpp index 073d8da09b9..40018ac08fd 100644 --- a/CGAL_ipelets/demo/CGAL_ipelets/triangulation.cpp +++ b/CGAL_ipelets/demo/CGAL_ipelets/triangulation.cpp @@ -47,9 +47,9 @@ const std::string Slab[] = { const std::string Hmsg[] = { "Draw a Delaunay triangulation of a set of points","Draw a Constrained Delaunay triangulation of a set of points and segments", - "Draw a Conforming Delaunay triangulation of a set of segments and points", - "Draw a Conforming Gabriel triangulation of a set of segments and points", - "Draw a Regular triangulation of a set of weighted points (circles, points)" + "Draw a conforming Delaunay triangulation of a set of segments and points", + "Draw a conforming Gabriel triangulation of a set of segments and points", + "Draw a regular triangulation of a set of weighted points (circles, points)" }; class triangulationIpelet diff --git a/GraphicsView/demo/Triangulation_2/Regular_triangulation_2.cpp b/GraphicsView/demo/Triangulation_2/Regular_triangulation_2.cpp index 14986381bcc..014700d0808 100644 --- a/GraphicsView/demo/Triangulation_2/Regular_triangulation_2.cpp +++ b/GraphicsView/demo/Triangulation_2/Regular_triangulation_2.cpp @@ -83,7 +83,7 @@ MainWindow::MainWindow() { setupUi(this); - // Add a GraphicItem for the Regular triangulation + // Add a GraphicItem for the regular triangulation dgi = new CGAL::Qt::RegularTriangulationGraphicsItem(&dt); QObject::connect(this, SIGNAL(changed()), diff --git a/Interpolation/doc/Interpolation/Interpolation.txt b/Interpolation/doc/Interpolation/Interpolation.txt index 51fe4510492..133b4354481 100644 --- a/Interpolation/doc/Interpolation/Interpolation.txt +++ b/Interpolation/doc/Interpolation/Interpolation.txt @@ -106,7 +106,7 @@ Section \ref secsurface and the reference page \subsection InterpolationImplementation Implementation -Given a Delaunay triangulation or a Regular triangulation, the +Given a Delaunay triangulation or a regular triangulation, the vertices in conflict with the query point are determined. The areas \f$ \pi_i(\mathbf{x})\f$ are computed by triangulating the Voronoi sub-cells. The normalization factor \f$ \pi(\mathbf{x})\f$ is also diff --git a/Periodic_2_triangulation_2/include/CGAL/Periodic_2_triangulation_2.h b/Periodic_2_triangulation_2/include/CGAL/Periodic_2_triangulation_2.h index 67a0b7f2082..1542d3b0494 100644 --- a/Periodic_2_triangulation_2/include/CGAL/Periodic_2_triangulation_2.h +++ b/Periodic_2_triangulation_2/include/CGAL/Periodic_2_triangulation_2.h @@ -197,7 +197,7 @@ public: // \} - /// Tag to distinguish Regular triangulations from others; + /// Tag to distinguish regular triangulations from others; typedef Tag_false Weighted_tag; protected: diff --git a/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_3.h b/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_3.h index ca95b748b93..e209d54f06d 100644 --- a/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_3.h +++ b/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_3.h @@ -2864,7 +2864,7 @@ inline void Periodic_3_triangulation_3::periodic_remove(Vertex_handle v, std::copy(tmp_vertices.begin(), tmp_vertices.end(), std::back_inserter(vertices)); - // create a Delaunay/Regular triangulation of the points on the boundary + // create a Delaunay/regular triangulation of the points on the boundary // in Euclidean space and make a map from the vertices in remover.tmp // towards the vertices in *this diff --git a/Triangulation_2/doc/Triangulation_2/PackageDescription.txt b/Triangulation_2/doc/Triangulation_2/PackageDescription.txt index 8f7e2b9c30a..a5d99c7a98b 100644 --- a/Triangulation_2/doc/Triangulation_2/PackageDescription.txt +++ b/Triangulation_2/doc/Triangulation_2/PackageDescription.txt @@ -23,7 +23,7 @@ \cgalPkgPicture{cdt2d-small.png} \cgalPkgSummaryBegin \cgalPkgAuthor{Mariette Yvinec} -\cgalPkgDesc{This package allows to build and handle various triangulations for point sets two dimensions. Any \cgal triangulation covers the convex hull of its vertices. Triangulations are built incrementally and can be modified by insertion or removal of vertices. They offer point location facilities. The package provides plain triangulation (whose faces depend on the insertion order of the vertices) and Delaunay triangulations. Regular triangulations are also provided for sets of weighted points. Delaunay and regular triangulations offer nearest neighbor queries and primitives to build the dual Voronoi and power diagrams. Finally, constrained and Delaunay constrained triangulations allows to force some constrained segments to appear as edges of the triangulation. Several versions of constrained and Delaunay constrained triangulations are provided: some of them handle intersections between input constraints segment while others do not. } +\cgalPkgDesc{This package allows to build and handle various triangulations for point sets two dimensions. Any \cgal triangulation covers the convex hull of its vertices. Triangulations are built incrementally and can be modified by insertion or removal of vertices. They offer point location facilities. The package provides plain triangulation (whose faces depend on the insertion order of the vertices) and Delaunay triangulations. Regular triangulations are also provided for sets of weighted points. Delaunay and regular triangulations offer nearest neighbor queries and primitives to build the dual Voronoi and power diagrams. Finally, constrained and Delaunay constrained triangulations allows to force some constrained segments to appear as edges of the triangulation. Several versions of constrained and Delaunay constrained triangulations are provided: some of them handle intersections between input constraints segment while others do not. } \cgalPkgManuals{Chapter_2D_Triangulations,PkgTriangulation2} \cgalPkgSummaryEnd \cgalPkgShortInfoBegin diff --git a/Triangulation_2/include/CGAL/Regular_triangulation_2.h b/Triangulation_2/include/CGAL/Regular_triangulation_2.h index fc7a00e66a3..5b8ccb5ffa5 100644 --- a/Triangulation_2/include/CGAL/Regular_triangulation_2.h +++ b/Triangulation_2/include/CGAL/Regular_triangulation_2.h @@ -198,7 +198,7 @@ public: typedef Finite_edges_iterator Edge_iterator; typedef Finite_vertices_iterator Vertex_iterator; - //Tag to distinguish Delaunay from Regular triangulations + //Tag to distinguish Delaunay from regular triangulations typedef Tag_true Weighted_tag; private: diff --git a/Triangulation_2/include/CGAL/Triangulation_2.h b/Triangulation_2/include/CGAL/Triangulation_2.h index 52884679a97..c740589d35d 100644 --- a/Triangulation_2/include/CGAL/Triangulation_2.h +++ b/Triangulation_2/include/CGAL/Triangulation_2.h @@ -210,7 +210,7 @@ public: OUTSIDE_CONVEX_HULL, //3 OUTSIDE_AFFINE_HULL}; //4 - //Tag to distinguish Regular triangulations from others; + //Tag to distinguish regular triangulations from others; typedef Tag_false Weighted_tag; protected: diff --git a/Triangulation_3/doc/Triangulation_3/PackageDescription.txt b/Triangulation_3/doc/Triangulation_3/PackageDescription.txt index c32542ab661..24e08eee9b7 100644 --- a/Triangulation_3/doc/Triangulation_3/PackageDescription.txt +++ b/Triangulation_3/doc/Triangulation_3/PackageDescription.txt @@ -20,7 +20,7 @@ \cgalPkgPicture{twotets.png} \cgalPkgSummaryBegin \cgalPkgAuthors{Clément Jamin, Sylvain Pion and Monique Teillaud} -\cgalPkgDesc{This package allows to build and handle triangulations for point sets in three dimensions. Any \cgal triangulation covers the convex hull of its vertices. Triangulations are build incrementally and can be modified by insertion, displacements or removal of vertices. They offer point location facilities. The package provides plain triangulation (whose faces depends on the insertion order of the vertices) and Delaunay triangulations. Regular triangulations are also provided for sets of weighted points. Delaunay and regular triangulations offer nearest neighbor queries and primitives to build the dual Voronoi and power diagrams. Optionally, the main Delaunay and regular triangulation algorithms (insert, remove) support multi-core shared-memory architectures to take advantage of available parallelism.} +\cgalPkgDesc{This package allows to build and handle triangulations for point sets in three dimensions. Any \cgal triangulation covers the convex hull of its vertices. Triangulations are build incrementally and can be modified by insertion, displacements or removal of vertices. They offer point location facilities. The package provides plain triangulation (whose faces depends on the insertion order of the vertices) and Delaunay triangulations. Regular triangulations are also provided for sets of weighted points. Delaunay and regular triangulations offer nearest neighbor queries and primitives to build the dual Voronoi and power diagrams. Optionally, the main Delaunay and regular triangulation algorithms (insert, remove) support multi-core shared-memory architectures to take advantage of available parallelism.} \cgalPkgManuals{Chapter_3D_Triangulations,PkgTriangulation3} \cgalPkgSummaryEnd \cgalPkgShortInfoBegin diff --git a/Triangulation_3/doc/Triangulation_3/Triangulation_3.txt b/Triangulation_3/doc/Triangulation_3/Triangulation_3.txt index f08357f618d..481610b3806 100644 --- a/Triangulation_3/doc/Triangulation_3/Triangulation_3.txt +++ b/Triangulation_3/doc/Triangulation_3/Triangulation_3.txt @@ -530,7 +530,7 @@ This example shows the parallel building of a Delaunay triangulation. \subsection Triangulation_3ParallelRegular Parallel Insertion and Removal in Regular Triangulation -This example shows the parallel building of a Regular triangulation, followed by the parallel +This example shows the parallel building of a regular triangulation, followed by the parallel removal of the first 100,000 vertices. \cgalExample{Triangulation_3/parallel_insertion_and_removal_in_regular_3.cpp} diff --git a/Triangulation_3/include/CGAL/Regular_triangulation_3.h b/Triangulation_3/include/CGAL/Regular_triangulation_3.h index 1d19bc412bf..f681352c462 100644 --- a/Triangulation_3/include/CGAL/Regular_triangulation_3.h +++ b/Triangulation_3/include/CGAL/Regular_triangulation_3.h @@ -145,7 +145,7 @@ namespace CGAL { typedef typename Gt::Plane_3 Plane; typedef typename Gt::Object_3 Object; - //Tag to distinguish Delaunay from Regular triangulations + //Tag to distinguish Delaunay from regular triangulations typedef Tag_true Weighted_tag; #ifndef CGAL_CFG_USING_BASE_MEMBER_BUG_2 @@ -830,7 +830,7 @@ namespace CGAL { // DISPLACEMENT Vertex_handle move_point(Vertex_handle v, const Weighted_point & p); - // Displacement works only for Regular triangulation + // Displacement works only for regular triangulation // without hidden points at any time Vertex_handle move_if_no_collision(Vertex_handle v, const Weighted_point & p); Vertex_handle move(Vertex_handle v, const Weighted_point & p); @@ -2470,7 +2470,7 @@ namespace CGAL { return insert(p, old_neighbor->cell()); } - // Displacement works only for Regular triangulation + // Displacement works only for regular triangulation // without hidden points at any time template < class Gt, class Tds, class Lds > typename Regular_triangulation_3::Vertex_handle @@ -2582,7 +2582,7 @@ namespace CGAL { } } if (verbose) - std::cerr << "valid Regular triangulation" << std::endl; + std::cerr << "valid regular triangulation" << std::endl; return true; }