Skip to content

Commit

Permalink
Merge pull request #4849 from MaelRL/PMP-No_caps_on_doc-GF
Browse files Browse the repository at this point in the history
Use lower case for function documentation starting with a verb (BGL/PMP)

# Conflicts:
#	Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/connected_components.h
  • Loading branch information
lrineau committed Jul 23, 2020
2 parents 1ab4eea + ebd65c9 commit a84927d
Show file tree
Hide file tree
Showing 13 changed files with 64 additions and 64 deletions.
6 changes: 3 additions & 3 deletions BGL/include/CGAL/boost/graph/Dual.h
Original file line number Diff line number Diff line change
Expand Up @@ -56,18 +56,18 @@ class Dual
/*! The underlying primal type. */
typedef Primal_ Primal;

/*! Construct a Dual from a given primal. */
/*! constructs a Dual from a given primal. */
Dual(const Primal& primal)
: primal_(primal) {}

/*! Returns the underlying primal. */
/*! returns the underlying primal. */
const Primal& primal() const
{ return primal_; }
};


/*!
Construct a `Dual` from a given `primal`.
constructs a `Dual` from a given `primal`.
\relates CGAL::Dual
*/
template<typename Primal>
Expand Down
2 changes: 1 addition & 1 deletion BGL/include/CGAL/boost/graph/METIS/partition_dual_graph.h
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ void partition_dual_graph(const TriangleMesh& tm, int nparts,

/// \ingroup PkgBGLPartition
///
/// Computes a partition of the input triangular mesh into `nparts` parts,
/// computes a partition of the input triangular mesh into `nparts` parts,
/// based on the mesh's dual graph. The resulting partition is stored in the vertex and/or face
/// property maps that are passed as parameters using \ref bgl_namedparameters "Named Parameters".
///
Expand Down
2 changes: 1 addition & 1 deletion BGL/include/CGAL/boost/graph/METIS/partition_graph.h
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ void partition_graph(const TriangleMesh& tm, int nparts,

/// \ingroup PkgBGLPartition
///
/// Computes a partition of the input triangular mesh into `nparts` parts, based on the
/// computes a partition of the input triangular mesh into `nparts` parts, based on the
/// mesh's nodal graph. The resulting partition is stored in the vertex and/or face
/// property maps that are passed as parameters using \ref bgl_namedparameters "Named Parameters".
///
Expand Down
66 changes: 33 additions & 33 deletions BGL/include/CGAL/boost/graph/Seam_mesh.h
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ class Seam_mesh
mutable vertices_size_type number_of_vertices;

public:
/// Returns the underlying mesh.
/// returns the underlying mesh.
const TM& mesh() const
{
return tm;
Expand Down Expand Up @@ -543,31 +543,31 @@ class Seam_mesh
/// \name Seam query functions
/// @{

/// Returns `true` if the vertex is on the seam.
/// returns `true` if the vertex is on the seam.
bool has_on_seam(TM_vertex_descriptor vd) const
{
return get(svm, vd);
}

/// Returns `true` if the edge is on the seam.
/// returns `true` if the edge is on the seam.
bool has_on_seam(TM_edge_descriptor ed) const
{
return get(sem, ed);
}

/// Returns `true` if the halfedge is on the seam.
/// returns `true` if the halfedge is on the seam.
bool has_on_seam(TM_halfedge_descriptor tmhd) const
{
return get(sem, CGAL::edge(tmhd, tm));
}

/// Returns `true` if the halfedge is on the seam.
/// returns `true` if the halfedge is on the seam.
bool has_on_seam(const halfedge_descriptor& hd) const
{
return has_on_seam(CGAL::edge(hd, tm));
}

/// Return the number of seam edges in the seam mesh.
/// returns the number of seam edges in the seam mesh.
edges_size_type number_of_seam_edges() const
{
return number_of_seams;
Expand Down Expand Up @@ -601,7 +601,7 @@ class Seam_mesh
}
/// @endcond

/// Returns the iterator range of the vertices of the mesh.
/// returns the iterator range of the vertices of the mesh.
Iterator_range<vertex_iterator> vertices() const
{
Iterator_range<TM_halfedge_iterator> ir = CGAL::halfedges(tm);
Expand All @@ -627,7 +627,7 @@ class Seam_mesh
}
/// @endcond

/// Returns the iterator range of the halfedges of the mesh.
/// returns the iterator range of the halfedges of the mesh.
Iterator_range<halfedge_iterator> halfedges() const
{
Iterator_range<TM_halfedge_iterator> ir = CGAL::halfedges(tm);
Expand All @@ -652,7 +652,7 @@ class Seam_mesh
}
/// @endcond

/// Returns the iterator range of the edges of the mesh.
/// returns the iterator range of the edges of the mesh.
Iterator_range<edge_iterator> edges() const
{
Iterator_range<TM_halfedge_iterator> ir = CGAL::halfedges(tm);
Expand All @@ -675,7 +675,7 @@ class Seam_mesh
}
/// @endcond

/// Returns the iterator range of the faces of the mesh.
/// returns the iterator range of the faces of the mesh.
Iterator_range<face_iterator> faces() const
{
return CGAL::faces(tm);
Expand All @@ -686,7 +686,7 @@ class Seam_mesh
/// \name Memory Management
/// @{

/// Returns the number of vertices in the seam mesh.
/// returns the number of vertices in the seam mesh.
vertices_size_type num_vertices() const
{
if(number_of_vertices == static_cast<vertices_size_type>(-1)) {
Expand All @@ -696,19 +696,19 @@ class Seam_mesh
return number_of_vertices;
}

/// Returns the number of halfedges in the seam mesh.
/// returns the number of halfedges in the seam mesh.
halfedges_size_type num_halfedges() const
{
return CGAL::num_halfedges(tm) + 2 * number_of_seams;
}

/// Returns the number of edges in the seam mesh.
/// returns the number of edges in the seam mesh.
halfedges_size_type num_edges() const
{
return CGAL::num_edges(tm) + number_of_seams;
}

/// Returns the number of faces in the seam mesh.
/// returns the number of faces in the seam mesh.
faces_size_type num_faces() const
{
return CGAL::num_faces(tm);
Expand All @@ -719,7 +719,7 @@ class Seam_mesh
/// \name Degree Functions
/// @{

/// Returns the number of incident halfedges of vertex `v`.
/// returns the number of incident halfedges of vertex `v`.
degree_size_type degree(vertex_descriptor v) const
{
degree_size_type count(0);
Expand All @@ -743,13 +743,13 @@ class Seam_mesh
#ifndef DOXYGEN_RUNNING
///@{

/// Returns the edge that contains halfedge `h` as one of its two halfedges.
/// returns the edge that contains halfedge `h` as one of its two halfedges.
edge_descriptor edge(halfedge_descriptor h) const
{
return edge_descriptor(h,this);
}

/// Returns the halfedge corresponding to the edge `e`.
/// returns the halfedge corresponding to the edge `e`.
halfedge_descriptor halfedge(edge_descriptor e) const
{
return e.hd;
Expand All @@ -758,7 +758,7 @@ class Seam_mesh

///@{

/// Returns an incoming halfedge of vertex `v`.
/// returns an incoming halfedge of vertex `v`.
/// If `v` is a seam vertex, this will be the halfedge whose target is `v` and
/// whose opposite is a virtual border halfedge.
/// Otherwise, the rules of the underlying mesh are followed.
Expand All @@ -769,7 +769,7 @@ class Seam_mesh
return halfedge_descriptor(h, false /*not on seam*/);
}

/// Finds a halfedge between two vertices. Returns a default constructed
/// finds a halfedge between two vertices. Returns a default constructed
/// `halfedge_descriptor`, if `source` and `target` are not connected.
std::pair<halfedge_descriptor, bool> halfedge(vertex_descriptor u,
vertex_descriptor v) const
Expand Down Expand Up @@ -800,7 +800,7 @@ class Seam_mesh
return std::make_pair(halfedge_descriptor(), false/*invalid*/);
}

/// Finds an edge between two vertices. Returns a default constructed
/// finds an edge between two vertices. Returns a default constructed
/// `edge`, if `source` and `target` are not connected.
std::pair<edge_descriptor, bool> edge(vertex_descriptor u, vertex_descriptor v) const
{
Expand All @@ -815,7 +815,7 @@ class Seam_mesh
return halfedge_descriptor(hd, false/*not on seam*/);
}

/// Returns the face incident to halfedge `h`.
/// returns the face incident to halfedge `h`.
face_descriptor face(halfedge_descriptor h) const
{
if(h.seam)
Expand All @@ -825,7 +825,7 @@ class Seam_mesh
}

public:
/// Returns the next halfedge within the incident face.
/// returns the next halfedge within the incident face.
halfedge_descriptor next(const halfedge_descriptor& hd) const
{
if((!hd.seam) && (!is_border(hd.tmhd, tm)))
Expand All @@ -840,7 +840,7 @@ class Seam_mesh
!is_border(CGAL::opposite(*hatc, tm), tm));
}

/// Returns the previous halfedge within the incident face.
/// returns the previous halfedge within the incident face.
halfedge_descriptor prev(const halfedge_descriptor& hd) const
{
if((!hd.seam) && (!is_border(hd.tmhd, tm)))
Expand All @@ -855,7 +855,7 @@ class Seam_mesh
!is_border(CGAL::opposite(*hatc, tm), tm));
}

/// Returns the opposite halfedge of `hd`.
/// returns the opposite halfedge of `hd`.
halfedge_descriptor opposite(const halfedge_descriptor& hd) const
{
if(!hd.seam)
Expand All @@ -864,7 +864,7 @@ class Seam_mesh
return halfedge_descriptor(CGAL::opposite(hd.tmhd, tm), false /*not on seam*/);
}

/// Returns the vertex the halfedge `h` emanates from.
/// returns the vertex the halfedge `h` emanates from.
vertex_descriptor target(halfedge_descriptor hd) const
{
TM_halfedge_descriptor tmhd(hd);
Expand All @@ -884,7 +884,7 @@ class Seam_mesh
return vertex_descriptor(halfedge_descriptor(tmhd));
}

/// Returns the vertex the halfedge `h` emanates from.
/// returns the vertex the halfedge `h` emanates from.
vertex_descriptor source(const halfedge_descriptor& hd) const
{
return target(opposite(hd));
Expand Down Expand Up @@ -922,7 +922,7 @@ class Seam_mesh
/// \name Seam selection
/// @{

/// Mark the edge of the underlying mesh that has extremities the vertices
/// marks the edge of the underlying mesh that has extremities the vertices
/// `tm_vd_s` and `tm_vd_s` as a seam edge.
///
/// \return whether the edge was successfully marked or not.
Expand Down Expand Up @@ -963,7 +963,7 @@ class Seam_mesh
return true;
}

/// Create new seams.
/// creates new seams.
///
/// The edges to be marked as seams are described by the range [first, last) of
/// vertices of the underlying mesh. Each edge to be marked is described
Expand Down Expand Up @@ -998,7 +998,7 @@ class Seam_mesh
return tmhd;
}

/// Create new seams.
/// creates new seams.
///
/// A seam edge is described by a pair of integers. The integer index
/// of a vertex of the underlying mesh is given by its position
Expand All @@ -1024,7 +1024,7 @@ class Seam_mesh
return add_seams(seam_vertices.begin(), seam_vertices.end());
}

/// Create new seams.
/// creates new seams.
///
/// A seam edge is described by a pair of integers. The integer
/// index of a vertex of the underlying mesh is defined as its position when
Expand All @@ -1041,7 +1041,7 @@ class Seam_mesh
return add_seams(in, tm_vds);
}

/// Create new seams.
/// creates new seams.
///
/// A seam edge is described by a pair of integers. The integer index
/// of a vertex of the underlying mesh is given by its position
Expand Down Expand Up @@ -1085,7 +1085,7 @@ class Seam_mesh
return add_seams(in, tm_vds);
}

/// Create new seams.
/// creates new seams.
///
/// A seam edge is described by a pair of integers. The integer
/// index of a vertex of the underlying mesh is defined as its position when
Expand All @@ -1104,7 +1104,7 @@ class Seam_mesh

/// @}

/// Constructs a seam mesh for a triangle mesh and an edge and vertex property map
/// constructs a seam mesh for a triangle mesh and an edge and vertex property map
///
/// \param tm the underlying mesh
/// \param sem the edge property map with value `true` for seam edges
Expand Down
12 changes: 6 additions & 6 deletions BGL/include/CGAL/boost/graph/selection.h
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ struct Regularization_graph

/*!
\ingroup PkgBGLSelectionFct
Augments a selection with faces of `fg` that are adjacent
augments a selection with faces of `fg` that are adjacent
to a face in `selection`. This process is applied `k` times considering
all faces added in the previous steps.
Two faces are said to be adjacent if they share a vertex or an edge.
Expand Down Expand Up @@ -356,7 +356,7 @@ expand_face_selection(

/*!
\ingroup PkgBGLSelectionFct
Diminishes a selection of faces from faces adjacent to a non-selected face.
diminishes a selection of faces from faces adjacent to a non-selected face.
This process is applied `k` times considering all faces removed in the previous steps.
Two faces are said to be adjacent if they share a vertex or an edge.
Each face removed from the selection is added exactly once in `out`.
Expand Down Expand Up @@ -749,7 +749,7 @@ select_incident_faces(

/*!
\ingroup PkgBGLSelectionFct
Augments a selection with edges of `fg` that are adjacent
augments a selection with edges of `fg` that are adjacent
to an edge in `selection`. This process is applied `k` times considering
all edges added in the previous steps.
Two edges are said to be adjacent if they are incident to the same face or vertex.
Expand Down Expand Up @@ -816,7 +816,7 @@ expand_edge_selection(

/*!
\ingroup PkgBGLSelectionFct
Diminishes a selection of edges from edges adjacent to a non-selected edge.
diminishes a selection of edges from edges adjacent to a non-selected edge.
This process is applied `k` times considering all edges removed in the previous steps.
Two edges are said to be adjacent if they are incident to the same face or vertex.
Each edge removed from the selection is added exactly once in `out`.
Expand Down Expand Up @@ -902,7 +902,7 @@ reduce_edge_selection(

/*!
\ingroup PkgBGLSelectionFct
Augments a selection with vertices of `fg` that are adjacent
augments a selection with vertices of `fg` that are adjacent
to a vertex in `selection`. This process is applied `k` times considering
all vertices added in the previous steps.
Two vertices are said to be adjacent if they are part of the same face.
Expand Down Expand Up @@ -957,7 +957,7 @@ expand_vertex_selection(

/*!
\ingroup PkgBGLSelectionFct
Diminishes a selection of vertices from vertices adjacent to a non-selected vertex.
diminishes a selection of vertices from vertices adjacent to a non-selected vertex.
This process is applied `k` times considering all vertices removed in the previous steps.
Two vertices are said to be adjacent if they are part of the same face.
Each vertex removed from the selection is added exactly once in `out`.
Expand Down
2 changes: 1 addition & 1 deletion BGL/include/CGAL/boost/graph/split_graph_into_polylines.h
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ class Less_on_G_copy_vertex_descriptors {
}
}; // end class Less_on_G_copy_vertex_descriptors

// Splits a graph at vertices with degree higher than two and at vertices where `is_terminal` returns `true`
// splits a graph at vertices with degree higher than two and at vertices where `is_terminal` returns `true`
// The vertices are duplicated, and new incident edges created.
// `OrigGraph` must be undirected
template <typename Graph,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -821,7 +821,7 @@ void keep_connected_components(PolygonMesh& pmesh

/*!
* \ingroup keep_connected_components_grp
* Removes in `pmesh` the connected components designated by theirs ids
* removes in `pmesh` the connected components designated by theirs ids
* in `components_to_remove` as well as all isolated vertices.
* The connected component id of a face is given by `fcm`.
*
Expand Down
Loading

0 comments on commit a84927d

Please sign in to comment.