From b84297f8f675a24ddd78b1663b35b673817aa543 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Mon, 29 Jul 2019 09:38:39 +0200 Subject: [PATCH] update the usage for the new CGAL named function parameters --- .../include/CGAL/jet_estimate_normals.h | 2 +- .../include/CGAL/mst_orient_normals.h | 4 +- .../include/CGAL/remove_outliers.h | 2 +- .../connected_components.h | 8 +-- .../Polygon_mesh_processing/corefinement.h | 2 +- .../internal/Snapping/snap.h | 36 ++++++------ .../CGAL/Polygon_mesh_processing/locate.h | 55 ++++++++++++------- .../CGAL/Polygon_mesh_processing/measure.h | 22 ++++---- .../CGAL/Polygon_mesh_processing/repair.h | 10 ++-- .../Polygon_mesh_processing/smooth_mesh.h | 30 +++++----- .../Polygon_mesh_processing/smooth_shape.h | 16 +++--- ...roperties_Triangulation_data_structure_2.h | 2 +- 12 files changed, 103 insertions(+), 86 deletions(-) diff --git a/Point_set_processing_3/include/CGAL/jet_estimate_normals.h b/Point_set_processing_3/include/CGAL/jet_estimate_normals.h index 13dffd49ef6..fd939367828 100644 --- a/Point_set_processing_3/include/CGAL/jet_estimate_normals.h +++ b/Point_set_processing_3/include/CGAL/jet_estimate_normals.h @@ -230,7 +230,7 @@ jet_estimate_normals( unsigned int degree_fitting = choose_parameter(get_parameter(np, internal_np::degree_fitting), 2); FT neighbor_radius = choose_parameter(get_parameter(np, internal_np::neighbor_radius), FT(0)); - const std::function& callback = choose_param(get_param(np, internal_np::callback), + const std::function& callback = choose_parameter(get_parameter(np, internal_np::callback), std::function()); typedef typename Kernel::Point_3 Point; diff --git a/Point_set_processing_3/include/CGAL/mst_orient_normals.h b/Point_set_processing_3/include/CGAL/mst_orient_normals.h index eea4681cf55..ca514afe76c 100644 --- a/Point_set_processing_3/include/CGAL/mst_orient_normals.h +++ b/Point_set_processing_3/include/CGAL/mst_orient_normals.h @@ -629,9 +629,9 @@ mst_orient_normals( PointMap point_map = choose_parameter(get_parameter(np, internal_np::point_map), PointMap()); NormalMap normal_map = choose_parameter(get_parameter(np, internal_np::normal_map), NormalMap()); - typename Kernel::FT neighbor_radius = choose_param(get_param(np, internal_np::neighbor_radius), + typename Kernel::FT neighbor_radius = choose_parameter(get_parameter(np, internal_np::neighbor_radius), typename Kernel::FT(0)); - ConstrainedMap constrained_map = choose_param(get_param(np, internal_np::point_is_constrained), ConstrainedMap()); + ConstrainedMap constrained_map = choose_parameter(get_parameter(np, internal_np::point_is_constrained), ConstrainedMap()); Kernel kernel; // Bring private stuff to scope diff --git a/Point_set_processing_3/include/CGAL/remove_outliers.h b/Point_set_processing_3/include/CGAL/remove_outliers.h index e08f50dfca6..fccc6393b76 100644 --- a/Point_set_processing_3/include/CGAL/remove_outliers.h +++ b/Point_set_processing_3/include/CGAL/remove_outliers.h @@ -165,7 +165,7 @@ remove_outliers( typename Kernel::FT(0)); double threshold_percent = choose_parameter(get_parameter(np, internal_np::threshold_percent), 10.); double threshold_distance = choose_parameter(get_parameter(np, internal_np::threshold_distance), 0.); - const std::function& callback = choose_param(get_param(np, internal_np::callback), + const std::function& callback = choose_parameter(get_parameter(np, internal_np::callback), std::function()); typedef typename Kernel::FT FT; diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/connected_components.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/connected_components.h index a7a01236b09..16375ee9673 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/connected_components.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/connected_components.h @@ -313,13 +313,13 @@ std::size_t keep_largest_connected_components(PolygonMesh& pmesh, get_property_map(boost::face_index, pmesh)); // FaceSizeMap - typedef typename boost::lookup_named_param_def // default >::type FaceSizeMap; typedef typename boost::property_traits::value_type Face_size; - FaceSizeMap face_size_pmap = choose_param(get_param(np, internal_np::face_size_map), + FaceSizeMap face_size_pmap = choose_parameter(get_parameter(np, internal_np::face_size_map), Constant_property_map(1)); // vector_property_map @@ -419,7 +419,7 @@ std::size_t keep_large_connected_components(PolygonMesh& pmesh, FaceIndexMap fim = choose_parameter(get_parameter(np, internal_np::face_index), get_property_map(boost::face_index, pmesh)); - typedef typename boost::lookup_named_param_def // default >::type FaceSizeMap; @@ -427,7 +427,7 @@ std::size_t keep_large_connected_components(PolygonMesh& pmesh, CGAL_static_assertion((std::is_convertible::value)); - FaceSizeMap face_size_pmap = choose_param(get_param(np, internal_np::face_size_map), + FaceSizeMap face_size_pmap = choose_parameter(get_parameter(np, internal_np::face_size_map), Constant_property_map(1)); // vector_property_map diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/corefinement.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/corefinement.h index 542b9f535ae..53264e1dc5e 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/corefinement.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/corefinement.h @@ -255,7 +255,7 @@ bool does_bound_a_volume(const TriangleMesh& tm) Corefinement::No_mark \ > ::type Ecm_out_##I; \ Ecm_out_##I ecm_out_##I = \ - internal_np::choose_parameter( internal_np::get_parameter(std::get(nps_out), internal_np::edge_is_constrained), \ + parameters::choose_parameter( parameters::get_parameter(std::get(nps_out), internal_np::edge_is_constrained), \ Corefinement::No_mark() ); diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Snapping/snap.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Snapping/snap.h index c8a9266375f..931b42d1d8f 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Snapping/snap.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Snapping/snap.h @@ -73,8 +73,8 @@ void assign_tolerance_with_local_edge_length_bound(const HalfedgeRange& hrange, PolygonMesh& mesh, const SourceNamedParameters& snp) { - using boost::get_param; - using boost::choose_param; + using parameters::get_parameter; + using parameters::choose_parameter; typedef typename boost::graph_traits::vertex_descriptor vertex_descriptor; typedef typename boost::graph_traits::halfedge_descriptor halfedge_descriptor; @@ -83,9 +83,9 @@ void assign_tolerance_with_local_edge_length_bound(const HalfedgeRange& hrange, typedef typename GetGeomTraits::type GT; typedef typename GT::FT FT; - GT gt = choose_param(get_param(snp, internal_np::geom_traits), GT()); - SVPM svpm = choose_param(get_param(snp, internal_np::vertex_point), - get_property_map(vertex_point, mesh)); + GT gt = choose_parameter(get_parameter(snp, internal_np::geom_traits), GT()); + SVPM svpm = choose_parameter(get_parameter(snp, internal_np::vertex_point), + get_property_map(vertex_point, mesh)); for(halfedge_descriptor hd : hrange) { @@ -121,7 +121,7 @@ template void assign_tolerance_with_local_edge_length_bound(const HalfedgeRange& hrange, ToleranceMap& tol_pmap, - const typename GetGeomTraits::type::FT tolerance, + const typename GetGeomTraits::type::FT tolerance, PolygonMesh& mesh) { return assign_tolerance_with_local_edge_length_bound(hrange, tol_pmap, tolerance, mesh, CGAL::parameters::all_default()); @@ -291,8 +291,8 @@ std::size_t snap_vertex_range_onto_vertex_range(const SourceHalfedgeRange& sourc const SourceNamedParameters& snp, const TargetNamedParameters& tnp) { - using boost::get_param; - using boost::choose_param; + using parameters::get_parameter; + using parameters::choose_parameter; typedef typename boost::graph_traits::vertex_descriptor vertex_descriptor; typedef typename boost::graph_traits::halfedge_descriptor halfedge_descriptor; @@ -312,12 +312,12 @@ std::size_t snap_vertex_range_onto_vertex_range(const SourceHalfedgeRange& sourc CGAL_static_assertion((std::is_same::value)); - GT gt = choose_param(get_param(snp, internal_np::geom_traits), GT()); + GT gt = choose_parameter(get_parameter(snp, internal_np::geom_traits), GT()); - SVPM svpm = choose_param(get_param(snp, internal_np::vertex_point), - get_property_map(vertex_point, smesh)); - TVPM tvpm = choose_param(get_param(tnp, internal_np::vertex_point), - get_const_property_map(vertex_point, tmesh)); + SVPM svpm = choose_parameter(get_parameter(snp, internal_np::vertex_point), + get_property_map(vertex_point, smesh)); + TVPM tvpm = choose_parameter(get_parameter(tnp, internal_np::vertex_point), + get_const_property_map(vertex_point, tmesh)); #ifdef CGAL_PMP_SNAP_DEBUG std::cout << "Snapping vertices to vertices. Range sizes: " @@ -683,8 +683,8 @@ std::size_t snap_vertex_range_onto_vertex_range_non_conforming(const HalfedgeRan typedef CGAL::AABB_traits AABB_Traits; typedef CGAL::AABB_tree AABB_tree; - using boost::get_param; - using boost::choose_param; + using parameters::get_parameter; + using parameters::choose_parameter; // Need to have a triangle mesh to ensure that the refinement point of a border edge 'e' has visibility // of the third p oint of the face 'f' incident to 'e' @@ -692,10 +692,10 @@ std::size_t snap_vertex_range_onto_vertex_range_non_conforming(const HalfedgeRan std::size_t snapped_n = 0; - VPM vpms = choose_param(get_param(nps, internal_np::vertex_point), get_property_map(vertex_point, pms)); - VPM vpmt = choose_param(get_param(npt, internal_np::vertex_point), get_property_map(vertex_point, pmt)); + VPM vpms = choose_parameter(get_parameter(nps, internal_np::vertex_point), get_property_map(vertex_point, pms)); + VPM vpmt = choose_parameter(get_parameter(npt, internal_np::vertex_point), get_property_map(vertex_point, pmt)); - const GT gt = choose_param(get_param(nps, internal_np::geom_traits), GT()); + const GT gt = choose_parameter(get_parameter(nps, internal_np::geom_traits), GT()); const bool is_same_mesh = (&pms == &pmt); // @todo probably not optimal diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/locate.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/locate.h index c1620434bb1..14e5e9192ac 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/locate.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/locate.h @@ -92,7 +92,7 @@ struct Ray_type_selector /// \tparam NamedParameters a sequence of \ref pmp_namedparameters "Named Parameters" /// template + typename NamedParameters = Named_function_parameters > class Location_traits { public: @@ -602,14 +602,16 @@ construct_point(const typename Location_traits::Face_location& loc typedef typename boost::graph_traits::halfedge_descriptor halfedge_descriptor; typedef typename GetVertexPointMap::const_type VertexPointMap; typedef typename boost::property_traits::value_type Point; - typedef typename GetGeomTraits::type Geom_traits; + using parameters::get_parameter; + using parameters::choose_parameter; CGAL_precondition(CGAL::is_triangle_mesh(tm)); - VertexPointMap vpm = boost::choose_param(boost::get_param(np, internal_np::vertex_point), - get_const_property_map(boost::vertex_point, tm)); - Geom_traits gt = choose_param(get_param(np, internal_np::geom_traits), Geom_traits()); + + VertexPointMap vpm = parameters::choose_parameter(parameters::get_parameter(np, internal_np::vertex_point), + get_const_property_map(boost::vertex_point, tm)); + Geom_traits gt = choose_parameter(get_parameter(np, internal_np::geom_traits), Geom_traits()); halfedge_descriptor hd = halfedge(loc.first, tm); const Point& p0 = get(vpm, source(hd, tm)); @@ -1090,12 +1092,14 @@ locate_in_face(const typename Location_traits::Po typedef typename GetGeomTraits::type Geom_traits; typedef typename GetVertexPointMap::const_type VertexPointMap; typedef typename boost::property_traits::value_type Point; + using parameters::get_parameter; + using parameters::choose_parameter; - VertexPointMap vpm = boost::choose_param(boost::get_param(np, internal_np::vertex_point), - get_const_property_map(boost::vertex_point, tm)); - Geom_traits gt = choose_param(get_param(np, internal_np::geom_traits), Geom_traits()); + VertexPointMap vpm = parameters::choose_parameter(parameters::get_parameter(np, internal_np::vertex_point), + get_const_property_map(boost::vertex_point, tm)); + Geom_traits gt = choose_parameter(get_parameter(np, internal_np::geom_traits), Geom_traits()); - FT snap_tolerance = choose_param(get_param(np, internal_np::snapping_tolerance), 0); + FT snap_tolerance = choose_parameter(get_parameter(np, internal_np::snapping_tolerance), 0); CGAL_precondition(fd != boost::graph_traits::null_face()); @@ -1548,9 +1552,11 @@ void build_AABB_tree(const TriangleMesh& tm, const NamedParameters& np) { typedef typename GetVertexPointMap::const_type VertexPointMap; + using parameters::get_parameter; + using parameters::choose_parameter; - const VertexPointMap vpm = boost::choose_param(boost::get_param(np, internal_np::vertex_point), - get_const_property_map(boost::vertex_point, tm)); + const VertexPointMap vpm = parameters::choose_parameter(parameters::get_parameter(np, internal_np::vertex_point), + get_const_property_map(boost::vertex_point, tm)); return internal::build_AABB_tree(tm, outTree, vpm); } @@ -1626,11 +1632,14 @@ locate_with_AABB_tree(const typename Location_traits::Point_and_primitive_id result = tree.closest_point_and_primitive(p3); + using parameters::get_parameter; + using parameters::choose_parameter; + // The VPM might return a point of any dimension, but the AABB tree necessarily returns // a Point_3. So, wrap the VPM (again) to give a Point_3. Even if it's already wrapped, we're just // forwarding a const& anyway. - const VertexPointMap vpm = boost::choose_param(boost::get_param(np, internal_np::vertex_point), - get_const_property_map(boost::vertex_point, tm)); + const VertexPointMap vpm = parameters::choose_parameter(parameters::get_parameter(np, internal_np::vertex_point), + get_const_property_map(boost::vertex_point, tm)); const WrappedVPM wrapped_vpm(vpm); return locate_in_face(result.first, result.second, tm, CGAL::parameters::vertex_point_map(wrapped_vpm)); @@ -1700,10 +1709,13 @@ locate(const typename Location_traits::Point& p, typedef internal::Point_to_Point_3 P_to_P3; typedef typename AABB_face_graph_traits::Point_3 Point_3; + using parameters::get_parameter; + using parameters::choose_parameter; + CGAL_static_assertion((std::is_same::value)); - const VertexPointMap vpm = boost::choose_param(boost::get_param(np, internal_np::vertex_point), - get_const_property_map(boost::vertex_point, tm)); + const VertexPointMap vpm = parameters::choose_parameter(parameters::get_parameter(np, internal_np::vertex_point), + get_const_property_map(boost::vertex_point, tm)); const WrappedVPM wrapped_vpm(vpm); AABB_tree tree; @@ -1786,6 +1798,9 @@ locate_with_AABB_tree(const typename Location_traits::Type Intersection_type; typedef boost::optional Ray_intersection; + using parameters::get_parameter; + using parameters::choose_parameter; + // First, transform the ray into a 3D ray if needed Ray_3 ray_3 = R_to_R3()(ray); @@ -1821,8 +1836,8 @@ locate_with_AABB_tree(const typename Location_traits::Ray& ray, typedef AABB_face_graph_triangle_primitive AABB_face_graph_primitive; typedef CGAL::AABB_traits::Geom_traits, AABB_face_graph_primitive> AABB_face_graph_traits; + using parameters::get_parameter; + using parameters::choose_parameter; - const VertexPointMap vpm = boost::choose_param(boost::get_param(np, internal_np::vertex_point), - get_const_property_map(boost::vertex_point, tm)); + const VertexPointMap vpm = parameters::choose_parameter(parameters::get_parameter(np, internal_np::vertex_point), + get_const_property_map(boost::vertex_point, tm)); const VPM wrapped_vpm(vpm); AABB_tree tree; diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/measure.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/measure.h index df6dd306e21..8e5c8871a40 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/measure.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/measure.h @@ -100,8 +100,8 @@ edge_length(typename boost::graph_traits::halfedge_descriptor h, const PolygonMesh& pmesh, const NamedParameters& np) { - using internal_np::choose_parameter; - using internal_np::get_parameter; + using parameters::choose_parameter; + using parameters::get_parameter; typename GetVertexPointMap::const_type vpm = choose_parameter(get_parameter(np, internal_np::vertex_point), @@ -321,8 +321,8 @@ face_area(typename boost::graph_traits::face_descriptor f, const TriangleMesh& tmesh, const CGAL_PMP_NP_CLASS& np) { - using internal_np::choose_parameter; - using internal_np::get_parameter; + using parameters::choose_parameter; + using parameters::get_parameter; typedef typename boost::graph_traits::halfedge_descriptor halfedge_descriptor; @@ -581,16 +581,16 @@ face_aspect_ratio(typename boost::graph_traits::face_descriptor f, typedef typename GetGeomTraits::type Geom_traits; typedef typename Geom_traits::FT FT; - using boost::choose_param; - using boost::get_param; + using parameters::choose_parameter; + using parameters::get_parameter; typename GetVertexPointMap::const_type - vpm = choose_param(get_param(np, internal_np::vertex_point), + vpm = choose_parameter(get_parameter(np, internal_np::vertex_point), get_const_property_map(CGAL::vertex_point, tmesh)); halfedge_descriptor h = halfedge(f, tmesh); - Geom_traits gt = choose_param(get_param(np, internal_np::geom_traits), Geom_traits()); + Geom_traits gt = choose_parameter(get_parameter(np, internal_np::geom_traits), Geom_traits()); #if 0 const FT sq_triangle_area = gt.compute_squared_area_3_object()(get(vpm, source(h, tmesh)), @@ -683,11 +683,11 @@ centroid(const TriangleMesh& tmesh, const CGAL_PMP_NP_CLASS& np) CGAL_assertion(is_triangle_mesh(tmesh)); CGAL_assertion(is_closed(tmesh)); - using boost::choose_param; - using boost::get_param; + using parameters::choose_parameter; + using parameters::get_parameter; typedef typename GetVertexPointMap::const_type Vpm; - Vpm vpm = choose_param(get_param(np, internal_np::vertex_point), + Vpm vpm = choose_parameter(get_parameter(np, internal_np::vertex_point), get_const_property_map(CGAL::vertex_point, tmesh)); typedef typename GetGeomTraits::type Kernel; diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/repair.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/repair.h index 8a243201420..38996a0fa68 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/repair.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/repair.h @@ -601,7 +601,7 @@ bool remove_degenerate_edges(const EdgeRange& edge_range, bool all_removed=false; bool some_removed=true; - bool preserve_genus = boost::choose_param(boost::get_param(np, internal_np::preserve_genus), true); + bool preserve_genus = parameters::choose_parameter(parameters::get_parameter(np, internal_np::preserve_genus), true); // collect edges of length 0 while(some_removed && !all_removed) @@ -2297,19 +2297,19 @@ template std::size_t duplicate_non_manifold_vertices(PolygonMesh& pm, const NamedParameters& np) { - using boost::get_param; - using boost::choose_param; + using parameters::get_parameter; + using parameters::choose_parameter; typedef boost::graph_traits GT; typedef typename GT::halfedge_descriptor halfedge_descriptor; - typedef typename boost::lookup_named_param_def < + typedef typename internal_np::Lookup_named_param_def < internal_np::output_iterator_t, NamedParameters, Emptyset_iterator > ::type Output_iterator; - Output_iterator out = choose_param(get_param(np, internal_np::output_iterator), Emptyset_iterator()); + Output_iterator out = choose_parameter(get_parameter(np, internal_np::output_iterator), Emptyset_iterator()); std::vector non_manifold_cones; non_manifold_vertices(pm, std::back_inserter(non_manifold_cones)); diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/smooth_mesh.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/smooth_mesh.h index d3239c25355..5eefc513f33 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/smooth_mesh.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/smooth_mesh.h @@ -29,7 +29,7 @@ #include #include -#include +#include #include #include @@ -119,12 +119,12 @@ void smooth_mesh(const FaceRange& faces, // its vertices are constrained. typedef CGAL::dynamic_vertex_property_t Vertex_property_tag; typedef typename boost::property_map::type Default_VCMap; - typedef typename boost::lookup_named_param_def ::type VCMap; - typedef typename boost::lookup_named_param_def // default > ::type ECMap; @@ -150,17 +150,17 @@ void smooth_mesh(const FaceRange& faces, if(std::begin(faces) == std::end(faces)) return; - using boost::choose_param; - using boost::get_param; + using parameters::choose_parameter; + using parameters::get_parameter; // named parameters - GeomTraits gt = choose_param(get_param(np, internal_np::geom_traits), + GeomTraits gt = choose_parameter(get_parameter(np, internal_np::geom_traits), GeomTraits()); - VertexPointMap vpmap = choose_param(get_param(np, internal_np::vertex_point), + VertexPointMap vpmap = choose_parameter(get_parameter(np, internal_np::vertex_point), get_property_map(CGAL::vertex_point, tmesh)); - const bool use_angle_smoothing = choose_param(get_param(np, internal_np::use_angle_smoothing), true); - bool use_area_smoothing = choose_param(get_param(np, internal_np::use_area_smoothing), true); + const bool use_angle_smoothing = choose_parameter(get_parameter(np, internal_np::use_angle_smoothing), true); + bool use_area_smoothing = choose_parameter(get_parameter(np, internal_np::use_area_smoothing), true); #ifndef CGAL_PMP_USE_CERES_SOLVER std::cerr << "Area-based smoothing requires the Ceres Library, which is not available." << std::endl; @@ -171,12 +171,12 @@ void smooth_mesh(const FaceRange& faces, if(!use_angle_smoothing && !use_area_smoothing) std::cerr << "Called PMP::smooth_mesh() without any smoothing method selected or available" << std::endl; - unsigned int nb_iterations = choose_param(get_param(np, internal_np::number_of_iterations), 1); - const bool do_project = choose_param(get_param(np, internal_np::do_project), true); - const bool use_safety_constraints = choose_param(get_param(np, internal_np::use_safety_constraints), true); - const bool use_Delaunay_flips = choose_param(get_param(np, internal_np::use_Delaunay_flips), true); + unsigned int nb_iterations = choose_parameter(get_parameter(np, internal_np::number_of_iterations), 1); + const bool do_project = choose_parameter(get_parameter(np, internal_np::do_project), true); + const bool use_safety_constraints = choose_parameter(get_parameter(np, internal_np::use_safety_constraints), true); + const bool use_Delaunay_flips = choose_parameter(get_parameter(np, internal_np::use_Delaunay_flips), true); - VCMap vcmap = choose_param(get_param(np, internal_np::vertex_is_constrained), + VCMap vcmap = choose_parameter(get_parameter(np, internal_np::vertex_is_constrained), get(Vertex_property_tag(), tmesh)); // If it's the default vcmap, manually set everything to false because the dynamic pmap has no default initialization @@ -186,7 +186,7 @@ void smooth_mesh(const FaceRange& faces, put(vcmap, v, false); } - ECMap ecmap = choose_param(get_param(np, internal_np::edge_is_constrained), + ECMap ecmap = choose_parameter(get_parameter(np, internal_np::edge_is_constrained), Constant_property_map(false)); // a constrained edge has constrained extremities diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/smooth_shape.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/smooth_shape.h index 3203646b967..740cc875b89 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/smooth_shape.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/smooth_shape.h @@ -93,20 +93,20 @@ void smooth_shape(const FaceRange& faces, typedef typename boost::graph_traits::vertex_descriptor vertex_descriptor; typedef typename GetGeomTraits::type GeomTraits; typedef typename GetVertexPointMap::type VertexPointMap; - typedef typename boost::lookup_named_param_def< + typedef typename internal_np::Lookup_named_param_def< internal_np::vertex_is_constrained_t, NamedParameters, Constant_property_map >::type VCMap; - using boost::choose_param; - using boost::get_param; + using parameters::choose_parameter; + using parameters::get_parameter; - GeomTraits gt = choose_param(get_param(np, internal_np::geom_traits), GeomTraits()); - VertexPointMap vpmap = choose_param(get_param(np, internal_np::vertex_point), + GeomTraits gt = choose_parameter(get_parameter(np, internal_np::geom_traits), GeomTraits()); + VertexPointMap vpmap = choose_parameter(get_parameter(np, internal_np::vertex_point), get_property_map(CGAL::vertex_point, tmesh)); - VCMap vcmap = choose_param(get_param(np, internal_np::vertex_is_constrained), + VCMap vcmap = choose_parameter(get_parameter(np, internal_np::vertex_is_constrained), Constant_property_map(false)); - const unsigned int nb_iterations = choose_param(get_param(np, internal_np::number_of_iterations), 1); + const unsigned int nb_iterations = choose_parameter(get_parameter(np, internal_np::number_of_iterations), 1); #if defined(CGAL_EIGEN3_ENABLED) #if EIGEN_VERSION_AT_LEAST(3,2,0) @@ -136,7 +136,7 @@ void smooth_shape(const FaceRange& faces, typedef typename Sparse_solver::Matrix Eigen_matrix; typedef typename Sparse_solver::Vector Eigen_vector; - Sparse_solver solver = choose_param(get_param(np, internal_np::sparse_linear_solver), Default_solver()); + Sparse_solver solver = choose_parameter(get_parameter(np, internal_np::sparse_linear_solver), Default_solver()); std::size_t n = vertices(tmesh).size(); Eigen_matrix A(n, n); diff --git a/Triangulation_2/include/CGAL/boost/graph/properties_Triangulation_data_structure_2.h b/Triangulation_2/include/CGAL/boost/graph/properties_Triangulation_data_structure_2.h index a2cb3d1411c..ed9cd4b3e72 100644 --- a/Triangulation_2/include/CGAL/boost/graph/properties_Triangulation_data_structure_2.h +++ b/Triangulation_2/include/CGAL/boost/graph/properties_Triangulation_data_structure_2.h @@ -24,7 +24,7 @@ #include #include -#include +#include #include