remove trailing whitespaces

This commit is contained in:
Maxime Gimeno 2020-04-02 15:02:27 +02:00
parent e02a3fc37e
commit b6a5f23e4e
5 changed files with 28 additions and 28 deletions

View File

@ -405,12 +405,12 @@ struct Update_vertex
typedef typename Tr1::Vertex V1; typedef typename Tr1::Vertex V1;
typedef typename Tr2::Vertex V2; typedef typename Tr2::Vertex V2;
typedef typename Tr2::Point Point; typedef typename Tr2::Point Point;
V2 operator()(const V1&) V2 operator()(const V1&)
{ {
return V2(); return V2();
} }
bool operator()(const V1& v1, V2& v2) bool operator()(const V1& v1, V2& v2)
{ {
v2.set_point(Point(v1.point())); v2.set_point(Point(v1.point()));
@ -432,9 +432,9 @@ struct Update_vertex
}; // end struct Update_vertex }; // end struct Update_vertex
struct Update_cell { struct Update_cell {
typedef Fake_mesh_domain::Surface_patch_index Sp_index; typedef Fake_mesh_domain::Surface_patch_index Sp_index;
template <typename C1, typename C2> template <typename C1, typename C2>
bool operator()(const C1& c1, C2& c2) { bool operator()(const C1& c1, C2& c2) {
c2.set_subdomain_index(c1.subdomain_index()); c2.set_subdomain_index(c1.subdomain_index());
@ -472,9 +472,9 @@ struct Update_vertex_from_CDT_3 {
}; // end struct Update_vertex }; // end struct Update_vertex
struct Update_cell_from_CDT_3 { struct Update_cell_from_CDT_3 {
typedef Fake_mesh_domain::Surface_patch_index Sp_index; typedef Fake_mesh_domain::Surface_patch_index Sp_index;
template <typename C1,typename C2> template <typename C1,typename C2>
void operator()(const C1& c1, C2& c2) { void operator()(const C1& c1, C2& c2) {
c2.set_subdomain_index(1); c2.set_subdomain_index(1);

View File

@ -1022,8 +1022,8 @@ It also calls the `is_valid` member function of the cell.
When `verbose` is set to `true`, messages are printed to give When `verbose` is set to `true`, messages are printed to give
a precise indication on the kind of invalidity encountered. a precise indication on the kind of invalidity encountered.
\cgalDebugEnd \cgalDebugEnd
*/ */
bool is_valid(Cell_handle c, bool verbose = false) const; bool is_valid(Cell_handle c, bool verbose = false) const;
/// @} /// @}
@ -1031,13 +1031,13 @@ bool is_valid(Cell_handle c, bool verbose = false) const;
/// @{ /// @{
/*! /*!
\ingroup PkgIOTDS3 \ingroup PkgIOTDS3
Reads a combinatorial triangulation from `is` and assigns it to `tds` Reads a combinatorial triangulation from `is` and assigns it to `tds`
*/ */
istream& operator>> (istream& is, TriangulationDataStructure_3 & tds); istream& operator>> (istream& is, TriangulationDataStructure_3 & tds);
/*! \ingroup PkgIOTDS3 /*! \ingroup PkgIOTDS3
Writes `tds` into the stream `os` Writes `tds` into the stream `os`
*/ */
ostream& operator<< (ostream& os, const TriangulationDataStructure_3 & tds); ostream& operator<< (ostream& os, const TriangulationDataStructure_3 & tds);
/*! \ingroup PkgIOTDS3 /*! \ingroup PkgIOTDS3

View File

@ -1559,28 +1559,28 @@ ostream& operator<< (ostream& os, const Triangulation_3 &t);
/*! /*!
\ingroup PkgIOTriangulation3 \ingroup PkgIOTriangulation3
The triangulation streamed in `is`, of original type `Tr_src`, is written into the triangulation. As the vertex and cell The triangulation streamed in `is`, of original type `Tr_src`, is written into the triangulation. As the vertex and cell
types might be different and incompatible, the creation of new cells and vertices types might be different and incompatible, the creation of new cells and vertices
is made thanks to the functors `convert_vertex` and `convert_cell`, that convert is made thanks to the functors `convert_vertex` and `convert_cell`, that convert
vertex and cell types. For each vertex `v_src` in `is`, the corresponding vertex and cell types. For each vertex `v_src` in `is`, the corresponding
vertex `v_tgt` in the triangulation is a copy of the vertex returned by `convert_vertex(v_src)`. vertex `v_tgt` in the triangulation is a copy of the vertex returned by `convert_vertex(v_src)`.
The same operations are done for cells with the functor convert_cell, except cells The same operations are done for cells with the functor convert_cell, except cells
in the triangulation are created using the default constructor, and then filled with the data in the triangulation are created using the default constructor, and then filled with the data
contained in the stream. contained in the stream.
- A model of `ConvertVertex` must provide two `operator()`s that are responsible - A model of `ConvertVertex` must provide two `operator()`s that are responsible
for converting the source vertex `v_src` into the target vertex: for converting the source vertex `v_src` into the target vertex:
- `Vertex operator()(const Tr_src::Vertex& v_src) const;` This operator is - `Vertex operator()(const Tr_src::Vertex& v_src) const;` This operator is
used to create the vertex from `v_src`. used to create the vertex from `v_src`.
- `void operator()(const Tr_src::Vertex& v_src, Vertex& v_tgt) const;` This - `void operator()(const Tr_src::Vertex& v_src, Vertex& v_tgt) const;` This
operator is meant to be used in case heavy data should be transferred to `v_tgt`. operator is meant to be used in case heavy data should be transferred to `v_tgt`.
- A model of ConvertCell must provide an operator() that is responsible for - A model of ConvertCell must provide an operator() that is responsible for
converting the source cell `c_src` into the target cell: converting the source cell `c_src` into the target cell:
- `void operator()(const Tr_src::Cell& c_src, Cell& c_tgt) const;` This operator - `void operator()(const Tr_src::Cell& c_src, Cell& c_tgt) const;` This operator
is meant to be used in case data should be transferred to `c_tgt`. is meant to be used in case data should be transferred to `c_tgt`.
\note The triangulation contained in `is` can be obtained with the `operator>>` of a `Triangulation_3`. \note The triangulation contained in `is` can be obtained with the `operator>>` of a `Triangulation_3`.
*/ */
template <typename Tr_src, template <typename Tr_src,
typename ConvertVertex, typename ConvertVertex,
typename ConvertCell> typename ConvertCell>
std::istream& file_input(std::istream& is, std::istream& file_input(std::istream& is,
@ -1589,7 +1589,7 @@ std::istream& file_input(std::istream& is,
/// @} /// @}
/// ///
/// \name Concurrency /// \name Concurrency
/// @{ /// @{
/*! /*!

View File

@ -2196,9 +2196,9 @@ public:
bool is_valid(bool verbose = false, int level = 0) const; bool is_valid(bool verbose = false, int level = 0) const;
bool is_valid(Cell_handle c, bool verbose = false, int level = 0) const; bool is_valid(Cell_handle c, bool verbose = false, int level = 0) const;
bool is_valid_finite(Cell_handle c, bool verbose = false, int level=0) const; bool is_valid_finite(Cell_handle c, bool verbose = false, int level=0) const;
//IO //IO
template <typename Tr_src, template <typename Tr_src,
typename ConvertVertex, typename ConvertVertex,
typename ConvertCell> typename ConvertCell>
std::istream& file_input(std::istream& is, std::istream& file_input(std::istream& is,

View File

@ -19,12 +19,12 @@ struct Update_vertex
typedef typename T1::Vertex V1; typedef typename T1::Vertex V1;
typedef typename T2::Vertex V2; typedef typename T2::Vertex V2;
typedef typename T2::Point Point; typedef typename T2::Point Point;
V2 operator()(const V1&) V2 operator()(const V1&)
{ {
return V2(); return V2();
} }
void operator()(const V1& v1, V2& v2) void operator()(const V1& v1, V2& v2)
{ {
CGAL::Cartesian_converter<K1, K2> c; CGAL::Cartesian_converter<K1, K2> c;
@ -32,7 +32,7 @@ struct Update_vertex
} }
}; // end struct Update_vertex }; // end struct Update_vertex
struct Update_cell { struct Update_cell {
template <typename C1, typename C2> template <typename C1, typename C2>
void operator()(const C1&, C2&) {} void operator()(const C1&, C2&) {}
}; // end struct Update_cell }; // end struct Update_cell
@ -48,8 +48,8 @@ int main()
std::ofstream out("tr"); std::ofstream out("tr");
out << T1; out << T1;
out.close(); out.close();
Tr2 T2; Tr2 T2;
std::ifstream in("tr"); std::ifstream in("tr");
T2.file_input<Tr1,Update_vertex<Tr1, Tr2>, Update_cell>(in); T2.file_input<Tr1,Update_vertex<Tr1, Tr2>, Update_cell>(in);
in.close(); in.close();
@ -59,8 +59,8 @@ int main()
assert(*(pit)++ == Tr2::Point(1,0,0)); assert(*(pit)++ == Tr2::Point(1,0,0));
assert(*(pit)++ == Tr2::Point(0,1,0)); assert(*(pit)++ == Tr2::Point(0,1,0));
assert(*(pit)++ == Tr2::Point(0,0,1)); assert(*(pit)++ == Tr2::Point(0,0,1));
std::cout << "done" << std::endl; std::cout << "done" << std::endl;
return 0; return 0;
} }