Misc fixes

This commit is contained in:
Mael Rouxel-Labbé 2020-05-29 18:12:18 +02:00
parent 21597d9c7c
commit df39cceb58
6 changed files with 27 additions and 12 deletions

View File

@ -114,9 +114,9 @@ int main (int argc, char* argv[])
// Loading point set from a file. // Loading point set from a file.
if (!CGAL::read_points(fname, if (!CGAL::read_points(fname,
std::back_inserter(points), std::back_inserter(points),
CGAL::parameters::point_map(Point_map()). CGAL::parameters::point_map(Point_map()).
normal_map(Normal_map()))) normal_map(Normal_map())))
{ {
std::cerr << "Error: cannot read file" << std::endl; std::cerr << "Error: cannot read file" << std::endl;
return EXIT_FAILURE; return EXIT_FAILURE;

View File

@ -194,7 +194,7 @@ the vertices, edges, facets and cells of the different types
\subsection AlphaShape3DIO Input/Output \subsection AlphaShape3DIO Input/Output
It is possible to export a 3D alpha shape to a `std::ostream` or to a `Geomview_stream` It is possible to export a 3D alpha shape to a `std::ostream` or to a `Geomview_stream`
using the `operator<<`. More information in the references of `Alpha_shape_3`. using the `operator<<`, see the documentation of the class `Alpha_shape_3` for more information.
\section AlphaShape3D_ConceptAndModels Concepts and Models \section AlphaShape3D_ConceptAndModels Concepts and Models

View File

@ -36,8 +36,8 @@ int main(int argc, char** argv)
// bfs = breadth first search explores the graph // bfs = breadth first search explores the graph
// Just as the distance_recorder there is a way to record the predecessor of a vertex // Just as the distance_recorder there is a way to record the predecessor of a vertex
boost::breadth_first_search(lcc, boost::breadth_first_search(lcc,
vd, vd,
visitor(boost::make_bfs_visitor visitor(boost::make_bfs_visitor
(boost::record_distances (boost::record_distances
(make_iterator_property_map (make_iterator_property_map
(distance.begin(), (distance.begin(),

View File

@ -74,7 +74,7 @@ bool read_polygon_mesh(std::istream& is,
* \param fname the name of the file. Its extension must be one of the following : * \param fname the name of the file. Its extension must be one of the following :
* `.off` (\ref IOStreamOFF "OFF file format") , `.obj` (\ref IOStreamOBJ "OBJ file format"), * `.off` (\ref IOStreamOFF "OFF file format") , `.obj` (\ref IOStreamOBJ "OBJ file format"),
* `.stl` (\ref IOStreamSTL "STL file format"), `.ply` (\ref IOStreamPLY "PLY file format"), * `.stl` (\ref IOStreamSTL "STL file format"), `.ply` (\ref IOStreamPLY "PLY file format"),
* `.vtp`(\ref IOStreamVTK "VTP file format") or `.ts`(\ref IOStreamGocad "GOCAD file format"). * `.vtp` (\ref IOStreamVTK "VTP file format") or `.ts` (\ref IOStreamGocad "GOCAD file format").
* \param g the mesh * \param g the mesh
* \param verbose whether extra information is printed when an incident occurs during reading * \param verbose whether extra information is printed when an incident occurs during reading
* \param np optional \ref pmp_namedparameters "Named Parameters" described below * \param np optional \ref pmp_namedparameters "Named Parameters" described below
@ -163,7 +163,7 @@ bool read_polygon_mesh(const char* fname, FaceGraph& g)
* \param fname the name of the file. Its extension must be one of the following : * \param fname the name of the file. Its extension must be one of the following :
* `.off` (\ref IOStreamOFF "OFF file format") , `.obj` (\ref IOStreamOBJ "OBJ file format"), * `.off` (\ref IOStreamOFF "OFF file format") , `.obj` (\ref IOStreamOBJ "OBJ file format"),
* `.stl` (\ref IOStreamSTL "STL file format"), `.ply` (\ref IOStreamPLY "PLY file format"), * `.stl` (\ref IOStreamSTL "STL file format"), `.ply` (\ref IOStreamPLY "PLY file format"),
* `.vtp`(\ref IOStreamVTK "VTP file format") or `.ts`(\ref IOStreamGocad "GOCAD file format"). * `.vtp` (\ref IOStreamVTK "VTP file format") or `.ts` (\ref IOStreamGocad "GOCAD file format").
* \param g the mesh to be output * \param g the mesh to be output
* \param verbose whether extra information is printed when an incident occurs during writing * \param verbose whether extra information is printed when an incident occurs during writing
* \param np optional \ref pmp_namedparameters "Named Parameters" described below * \param np optional \ref pmp_namedparameters "Named Parameters" described below
@ -181,8 +181,8 @@ bool read_polygon_mesh(const char* fname, FaceGraph& g)
*/ */
template <class FaceGraph, typename NamedParameters> template <class FaceGraph, typename NamedParameters>
bool write_polygon_mesh(const std::string& fname, bool write_polygon_mesh(const std::string& fname,
FaceGraph& g, FaceGraph& g,
const NamedParameters& np, const NamedParameters& np,
const bool verbose = false) const bool verbose = false)
{ {
const std::string ext = IO::internal::get_file_extension(fname); const std::string ext = IO::internal::get_file_extension(fname);

View File

@ -186,6 +186,7 @@ struct LCC_property_map<edge_external_index_t>
typedef type const_type; typedef type const_type;
}; };
}; };
template <> template <>
struct LCC_property_map<halfedge_external_index_t> struct LCC_property_map<halfedge_external_index_t>
{ {
@ -197,6 +198,8 @@ struct LCC_property_map<halfedge_external_index_t>
typedef type const_type; typedef type const_type;
}; };
}; };
template <> template <>
struct LCC_property_map<vertex_external_index_t> struct LCC_property_map<vertex_external_index_t>
{ {
@ -208,6 +211,7 @@ struct LCC_property_map<vertex_external_index_t>
typedef type const_type; typedef type const_type;
}; };
}; };
template <> template <>
struct LCC_property_map<face_external_index_t> struct LCC_property_map<face_external_index_t>
{ {
@ -234,6 +238,7 @@ get(boost::halfedge_external_index_t, CGAL_LCC_TYPE const&)
return typename boost::property_map<CGAL_LCC_TYPE, boost::halfedge_external_index_t>:: return typename boost::property_map<CGAL_LCC_TYPE, boost::halfedge_external_index_t>::
const_type(halfedges(ncmap).begin(), halfedges(ncmap).end(), num_halfedges(ncmap)); const_type(halfedges(ncmap).begin(), halfedges(ncmap).end(), num_halfedges(ncmap));
} }
template<CGAL_LCC_ARGS> template<CGAL_LCC_ARGS>
typename boost::property_map<CGAL_LCC_TYPE, boost::vertex_external_index_t >::const_type typename boost::property_map<CGAL_LCC_TYPE, boost::vertex_external_index_t >::const_type
get(boost::vertex_external_index_t, CGAL_LCC_TYPE const&) get(boost::vertex_external_index_t, CGAL_LCC_TYPE const&)
@ -242,6 +247,7 @@ get(boost::vertex_external_index_t, CGAL_LCC_TYPE const&)
return typename boost::property_map<CGAL_LCC_TYPE, boost::vertex_external_index_t>:: return typename boost::property_map<CGAL_LCC_TYPE, boost::vertex_external_index_t>::
const_type(vertices(ncmap).begin(), vertices(ncmap).end(), num_vertices(ncmap)); const_type(vertices(ncmap).begin(), vertices(ncmap).end(), num_vertices(ncmap));
} }
template<CGAL_LCC_ARGS> template<CGAL_LCC_ARGS>
typename boost::property_map<CGAL_LCC_TYPE, boost::edge_external_index_t >::const_type typename boost::property_map<CGAL_LCC_TYPE, boost::edge_external_index_t >::const_type
get(boost::edge_external_index_t, CGAL_LCC_TYPE const&) get(boost::edge_external_index_t, CGAL_LCC_TYPE const&)
@ -249,6 +255,7 @@ get(boost::edge_external_index_t, CGAL_LCC_TYPE const&)
return typename boost::property_map<CGAL_LCC_TYPE, boost::edge_external_index_t>:: return typename boost::property_map<CGAL_LCC_TYPE, boost::edge_external_index_t>::
const_type(const_cast<CGAL_LCC_TYPE&>(cmap)); const_type(const_cast<CGAL_LCC_TYPE&>(cmap));
} }
template<CGAL_LCC_ARGS> template<CGAL_LCC_ARGS>
typename boost::property_map<CGAL_LCC_TYPE, boost::face_external_index_t >::const_type typename boost::property_map<CGAL_LCC_TYPE, boost::face_external_index_t >::const_type
get(boost::face_external_index_t, CGAL_LCC_TYPE const&) get(boost::face_external_index_t, CGAL_LCC_TYPE const&)
@ -267,6 +274,7 @@ get(boost::edge_index_t, CGAL_LCC_TYPE const& cmap)
return typename boost::property_map<CGAL_LCC_TYPE,boost::edge_index_t>:: return typename boost::property_map<CGAL_LCC_TYPE,boost::edge_index_t>::
const_type(const_cast<CGAL_LCC_TYPE&>(cmap)); const_type(const_cast<CGAL_LCC_TYPE&>(cmap));
} }
template<CGAL_LCC_ARGS> template<CGAL_LCC_ARGS>
typename boost::property_map<CGAL_LCC_TYPE, boost::halfedge_index_t >::const_type typename boost::property_map<CGAL_LCC_TYPE, boost::halfedge_index_t >::const_type
get(boost::halfedge_index_t, CGAL_LCC_TYPE const& cmap) get(boost::halfedge_index_t, CGAL_LCC_TYPE const& cmap)
@ -274,6 +282,7 @@ get(boost::halfedge_index_t, CGAL_LCC_TYPE const& cmap)
return typename boost::property_map<CGAL_LCC_TYPE,boost::halfedge_index_t>:: return typename boost::property_map<CGAL_LCC_TYPE,boost::halfedge_index_t>::
const_type(const_cast<CGAL_LCC_TYPE&>(cmap)); const_type(const_cast<CGAL_LCC_TYPE&>(cmap));
} }
template<CGAL_LCC_ARGS> template<CGAL_LCC_ARGS>
typename boost::property_map<CGAL_LCC_TYPE, boost::vertex_index_t >::const_type typename boost::property_map<CGAL_LCC_TYPE, boost::vertex_index_t >::const_type
get(boost::vertex_index_t, CGAL_LCC_TYPE const& cmap) get(boost::vertex_index_t, CGAL_LCC_TYPE const& cmap)
@ -281,6 +290,7 @@ get(boost::vertex_index_t, CGAL_LCC_TYPE const& cmap)
return typename boost::property_map<CGAL_LCC_TYPE,boost::vertex_index_t>:: return typename boost::property_map<CGAL_LCC_TYPE,boost::vertex_index_t>::
const_type(const_cast<CGAL_LCC_TYPE&>(cmap)); const_type(const_cast<CGAL_LCC_TYPE&>(cmap));
} }
template<CGAL_LCC_ARGS> template<CGAL_LCC_ARGS>
typename boost::property_map<CGAL_LCC_TYPE, boost::face_index_t >::const_type typename boost::property_map<CGAL_LCC_TYPE, boost::face_index_t >::const_type
get(boost::face_index_t, CGAL_LCC_TYPE const& cmap) get(boost::face_index_t, CGAL_LCC_TYPE const& cmap)
@ -288,6 +298,7 @@ get(boost::face_index_t, CGAL_LCC_TYPE const& cmap)
return typename boost::property_map<CGAL_LCC_TYPE,boost::face_index_t>:: return typename boost::property_map<CGAL_LCC_TYPE,boost::face_index_t>::
const_type(const_cast<CGAL_LCC_TYPE&>(cmap)); const_type(const_cast<CGAL_LCC_TYPE&>(cmap));
} }
*/ */
/*template<CGAL_LCC_ARGS> /*template<CGAL_LCC_ARGS>
@ -316,6 +327,7 @@ get(boost::halfedge_external_index_t, CGAL_LCC_TYPE&)
return typename boost::property_map<CGAL_LCC_TYPE, boost::halfedge_external_index_t>:: return typename boost::property_map<CGAL_LCC_TYPE, boost::halfedge_external_index_t>::
type(halfedges(cmap).begin(), halfedges(cmap).end(), num_halfedges(cmap)); type(halfedges(cmap).begin(), halfedges(cmap).end(), num_halfedges(cmap));
} }
template<CGAL_LCC_ARGS> template<CGAL_LCC_ARGS>
typename boost::property_map<CGAL_LCC_TYPE, boost::vertex_external_index_t >::type typename boost::property_map<CGAL_LCC_TYPE, boost::vertex_external_index_t >::type
get(boost::vertex_external_index_t, CGAL_LCC_TYPE&) get(boost::vertex_external_index_t, CGAL_LCC_TYPE&)
@ -323,6 +335,7 @@ get(boost::vertex_external_index_t, CGAL_LCC_TYPE&)
return typename boost::property_map<CGAL_LCC_TYPE, boost::vertex_external_index_t>:: return typename boost::property_map<CGAL_LCC_TYPE, boost::vertex_external_index_t>::
type(vertices(cmap).begin(), vertices(cmap).end(), num_vertices(cmap)); type(vertices(cmap).begin(), vertices(cmap).end(), num_vertices(cmap));
} }
template<CGAL_LCC_ARGS> template<CGAL_LCC_ARGS>
typename boost::property_map<CGAL_LCC_TYPE, boost::edge_external_index_t >::type typename boost::property_map<CGAL_LCC_TYPE, boost::edge_external_index_t >::type
get(boost::edge_external_index_t, CGAL_LCC_TYPE& cmap) get(boost::edge_external_index_t, CGAL_LCC_TYPE& cmap)
@ -330,6 +343,8 @@ get(boost::edge_external_index_t, CGAL_LCC_TYPE& cmap)
return typename boost::property_map<CGAL_LCC_TYPE, boost::edge_external_index_t>:: return typename boost::property_map<CGAL_LCC_TYPE, boost::edge_external_index_t>::
type(const_cast<CGAL_LCC_TYPE&>(cmap)); type(const_cast<CGAL_LCC_TYPE&>(cmap));
} }
template<CGAL_LCC_ARGS> template<CGAL_LCC_ARGS>
typename boost::property_map<CGAL_LCC_TYPE, boost::face_external_index_t >::type typename boost::property_map<CGAL_LCC_TYPE, boost::face_external_index_t >::type
get(boost::face_external_index_t, CGAL_LCC_TYPE&) get(boost::face_external_index_t, CGAL_LCC_TYPE&)

View File

@ -65,7 +65,7 @@ std::string get_file_extension(const std::string fname)
* \param fname the name of the file. Its extension must be one of the following : * \param fname the name of the file. Its extension must be one of the following :
* `.off` (\ref IOStreamOFF "OFF file format") , `.obj` (\ref IOStreamOBJ "OBJ file format"), * `.off` (\ref IOStreamOFF "OFF file format") , `.obj` (\ref IOStreamOBJ "OBJ file format"),
* `.stl` (\ref IOStreamSTL "STL file format"), `.ply` (\ref IOStreamPLY "PLY file format") * `.stl` (\ref IOStreamSTL "STL file format"), `.ply` (\ref IOStreamPLY "PLY file format")
* or `.ts`(\ref IOStreamGocad "GOCAD file format"). * or `.ts` (\ref IOStreamGocad "GOCAD file format").
* \param polygons each element in the range describes a polygon * \param polygons each element in the range describes a polygon
* using the indices of the vertices. * using the indices of the vertices.
* \param points points of the soup of polygons * \param points points of the soup of polygons
@ -126,7 +126,7 @@ bool read_polygon_soup(const std::string& fname,
* \param fname the name of the file. Its extension must be one of the following : * \param fname the name of the file. Its extension must be one of the following :
* `.off` (\ref IOStreamOFF "OFF file format") , `.obj` (\ref IOStreamOBJ "OBJ file format"), * `.off` (\ref IOStreamOFF "OFF file format") , `.obj` (\ref IOStreamOBJ "OBJ file format"),
* `.stl` (\ref IOStreamSTL "STL file format"), `.ply` (\ref IOStreamPLY "PLY file format") * `.stl` (\ref IOStreamSTL "STL file format"), `.ply` (\ref IOStreamPLY "PLY file format")
* or `.ts`(\ref IOStreamGocad "GOCAD file format"). * or `.ts` (\ref IOStreamGocad "GOCAD file format").
* \param polygons each element in the range describes a polygon * \param polygons each element in the range describes a polygon
* using the indices of the vertices. * using the indices of the vertices.
* \param points points of the soup of polygons * \param points points of the soup of polygons