mirror of https://github.com/CGAL/cgal
Fixed regular triangulation capitalization across CGAL
This commit is contained in:
parent
ac112a0530
commit
1fc2282350
|
|
@ -5,13 +5,13 @@
|
||||||
|
|
||||||
The concept `WeightedAlphaShapeTraits_2` describes the requirements
|
The concept `WeightedAlphaShapeTraits_2` describes the requirements
|
||||||
for the geometric traits class
|
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`
|
\cgalRefines `RegularTriangulationTraits_2`
|
||||||
|
|
||||||
In addition to the requirements described in the concept
|
In addition to the requirements described in the concept
|
||||||
::RegularTriangulationTraits_2, the geometric traits class of a
|
::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.
|
following.
|
||||||
|
|
||||||
\cgalHasModel All models of `Kernel`.
|
\cgalHasModel All models of `Kernel`.
|
||||||
|
|
|
||||||
|
|
@ -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
|
\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.
|
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
|
\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.
|
and \link Tag_false `Tag_false`\endlink otherwise. The default is \link Tag_false `Tag_false`\endlink.
|
||||||
|
|
||||||
\cgalModels `AlphaShapeCell_3`
|
\cgalModels `AlphaShapeCell_3`
|
||||||
|
|
|
||||||
|
|
@ -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
|
\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.
|
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
|
\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.
|
and \link Tag_false `Tag_false`\endlink otherwise. The default is \link Tag_false `Tag_false`\endlink.
|
||||||
|
|
||||||
\cgalModels `AlphaShapeVertex_3`
|
\cgalModels `AlphaShapeVertex_3`
|
||||||
|
|
|
||||||
|
|
@ -4,13 +4,13 @@
|
||||||
\cgalConcept
|
\cgalConcept
|
||||||
|
|
||||||
The concept `FixedWeightedAlphaShapeTraits_3` describes the requirements
|
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`
|
\cgalRefines `RegularTriangulationTraits_3`
|
||||||
|
|
||||||
In addition to the requirements described in the concept
|
In addition to the requirements described in the concept
|
||||||
::RegularTriangulationTraits_3, the geometric traits class of a
|
::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.
|
alpha value provides the following.
|
||||||
|
|
||||||
\cgalHasModel All models of `Kernel`.
|
\cgalHasModel All models of `Kernel`.
|
||||||
|
|
|
||||||
|
|
@ -5,13 +5,13 @@
|
||||||
|
|
||||||
The concept `WeightedAlphaShapeTraits_3` describes the requirements
|
The concept `WeightedAlphaShapeTraits_3` describes the requirements
|
||||||
for the geometric traits class
|
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`
|
\cgalRefines `RegularTriangulationTraits_3`
|
||||||
|
|
||||||
In addition to the requirements described in the concept
|
In addition to the requirements described in the concept
|
||||||
::RegularTriangulationTraits_3, the geometric traits class of a
|
::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.
|
following.
|
||||||
|
|
||||||
\cgalHasModel All models of `Kernel`.
|
\cgalHasModel All models of `Kernel`.
|
||||||
|
|
|
||||||
|
|
@ -47,9 +47,9 @@ const std::string Slab[] = {
|
||||||
|
|
||||||
const std::string Hmsg[] = {
|
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 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 Delaunay triangulation of a set of segments and points",
|
||||||
"Draw a Conforming Gabriel 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 regular triangulation of a set of weighted points (circles, points)"
|
||||||
};
|
};
|
||||||
|
|
||||||
class triangulationIpelet
|
class triangulationIpelet
|
||||||
|
|
|
||||||
|
|
@ -83,7 +83,7 @@ MainWindow::MainWindow()
|
||||||
{
|
{
|
||||||
setupUi(this);
|
setupUi(this);
|
||||||
|
|
||||||
// Add a GraphicItem for the Regular triangulation
|
// Add a GraphicItem for the regular triangulation
|
||||||
dgi = new CGAL::Qt::RegularTriangulationGraphicsItem<Regular>(&dt);
|
dgi = new CGAL::Qt::RegularTriangulationGraphicsItem<Regular>(&dt);
|
||||||
|
|
||||||
QObject::connect(this, SIGNAL(changed()),
|
QObject::connect(this, SIGNAL(changed()),
|
||||||
|
|
|
||||||
|
|
@ -106,7 +106,7 @@ Section \ref secsurface and the reference page
|
||||||
|
|
||||||
\subsection InterpolationImplementation Implementation
|
\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
|
vertices in conflict with the query point are determined. The areas
|
||||||
\f$ \pi_i(\mathbf{x})\f$ are computed by triangulating the Voronoi
|
\f$ \pi_i(\mathbf{x})\f$ are computed by triangulating the Voronoi
|
||||||
sub-cells. The normalization factor \f$ \pi(\mathbf{x})\f$ is also
|
sub-cells. The normalization factor \f$ \pi(\mathbf{x})\f$ is also
|
||||||
|
|
|
||||||
|
|
@ -197,7 +197,7 @@ public:
|
||||||
// \}
|
// \}
|
||||||
|
|
||||||
|
|
||||||
/// Tag to distinguish Regular triangulations from others;
|
/// Tag to distinguish regular triangulations from others;
|
||||||
typedef Tag_false Weighted_tag;
|
typedef Tag_false Weighted_tag;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
|
|
|
||||||
|
|
@ -2864,7 +2864,7 @@ inline void Periodic_3_triangulation_3<GT,TDS>::periodic_remove(Vertex_handle v,
|
||||||
std::copy(tmp_vertices.begin(), tmp_vertices.end(),
|
std::copy(tmp_vertices.begin(), tmp_vertices.end(),
|
||||||
std::back_inserter(vertices));
|
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
|
// in Euclidean space and make a map from the vertices in remover.tmp
|
||||||
// towards the vertices in *this
|
// towards the vertices in *this
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -198,7 +198,7 @@ public:
|
||||||
typedef Finite_edges_iterator Edge_iterator;
|
typedef Finite_edges_iterator Edge_iterator;
|
||||||
typedef Finite_vertices_iterator Vertex_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;
|
typedef Tag_true Weighted_tag;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
|
||||||
|
|
@ -210,7 +210,7 @@ public:
|
||||||
OUTSIDE_CONVEX_HULL, //3
|
OUTSIDE_CONVEX_HULL, //3
|
||||||
OUTSIDE_AFFINE_HULL}; //4
|
OUTSIDE_AFFINE_HULL}; //4
|
||||||
|
|
||||||
//Tag to distinguish Regular triangulations from others;
|
//Tag to distinguish regular triangulations from others;
|
||||||
typedef Tag_false Weighted_tag;
|
typedef Tag_false Weighted_tag;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
|
|
|
||||||
|
|
@ -530,7 +530,7 @@ This example shows the parallel building of a Delaunay triangulation.
|
||||||
|
|
||||||
\subsection Triangulation_3ParallelRegular Parallel Insertion and Removal in Regular 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.
|
removal of the first 100,000 vertices.
|
||||||
|
|
||||||
\cgalExample{Triangulation_3/parallel_insertion_and_removal_in_regular_3.cpp}
|
\cgalExample{Triangulation_3/parallel_insertion_and_removal_in_regular_3.cpp}
|
||||||
|
|
|
||||||
|
|
@ -145,7 +145,7 @@ namespace CGAL {
|
||||||
typedef typename Gt::Plane_3 Plane;
|
typedef typename Gt::Plane_3 Plane;
|
||||||
typedef typename Gt::Object_3 Object;
|
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;
|
typedef Tag_true Weighted_tag;
|
||||||
|
|
||||||
#ifndef CGAL_CFG_USING_BASE_MEMBER_BUG_2
|
#ifndef CGAL_CFG_USING_BASE_MEMBER_BUG_2
|
||||||
|
|
@ -830,7 +830,7 @@ namespace CGAL {
|
||||||
// DISPLACEMENT
|
// DISPLACEMENT
|
||||||
Vertex_handle move_point(Vertex_handle v, const Weighted_point & p);
|
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
|
// without hidden points at any time
|
||||||
Vertex_handle move_if_no_collision(Vertex_handle v, const Weighted_point & p);
|
Vertex_handle move_if_no_collision(Vertex_handle v, const Weighted_point & p);
|
||||||
Vertex_handle move(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());
|
return insert(p, old_neighbor->cell());
|
||||||
}
|
}
|
||||||
|
|
||||||
// Displacement works only for Regular triangulation
|
// Displacement works only for regular triangulation
|
||||||
// without hidden points at any time
|
// without hidden points at any time
|
||||||
template < class Gt, class Tds, class Lds >
|
template < class Gt, class Tds, class Lds >
|
||||||
typename Regular_triangulation_3<Gt,Tds,Lds>::Vertex_handle
|
typename Regular_triangulation_3<Gt,Tds,Lds>::Vertex_handle
|
||||||
|
|
@ -2582,7 +2582,7 @@ namespace CGAL {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (verbose)
|
if (verbose)
|
||||||
std::cerr << "valid Regular triangulation" << std::endl;
|
std::cerr << "valid regular triangulation" << std::endl;
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue