From 047ddad86c251bbacfe0c3459e50ebaed6c87abf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Mon, 3 Jan 2022 18:31:57 +0100 Subject: [PATCH] remove optional parameter --- BGL/test/BGL/test_Face_filtered_graph.cpp | 20 +++++++++---------- .../test_deprecated_io_point_set.cpp | 19 ++++++++---------- .../Polyhedron/Plugins/IO/VTK_io_plugin.cpp | 2 +- .../PMP/Surface_intersection_plugin.cpp | 3 +-- .../Polyhedron/Scene_surface_mesh_item.cpp | 3 +-- .../vsa_timing_benchmark.cpp | 2 +- .../Surface_mesh_parameterization/lscm.cpp | 2 +- .../orbifold.cpp | 3 +-- .../extensive_parameterization_test.cpp | 2 +- 9 files changed, 25 insertions(+), 31 deletions(-) diff --git a/BGL/test/BGL/test_Face_filtered_graph.cpp b/BGL/test/BGL/test_Face_filtered_graph.cpp index 2da2f3ed205..f8ee6049f9e 100644 --- a/BGL/test/BGL/test_Face_filtered_graph.cpp +++ b/BGL/test/BGL/test_Face_filtered_graph.cpp @@ -25,7 +25,7 @@ void test_halfedge_around_vertex_iterator(const Graph& g) typedef CGAL::Face_filtered_graph Adapter; CGAL_GRAPH_TRAITS_MEMBERS(Adapter); boost::unordered_map map(num_faces(g)); - PMP::connected_components(g, boost::make_assoc_property_map(map), CGAL::parameters::all_default()); + PMP::connected_components(g, boost::make_assoc_property_map(map)); Adapter fg(g, 0, boost::make_assoc_property_map(map)); typename boost::graph_traits::vertex_iterator vit, vend; @@ -52,7 +52,7 @@ void test_halfedge_around_face_iterator(const Graph& g) typedef CGAL::Face_filtered_graph Adapter; CGAL_GRAPH_TRAITS_MEMBERS(Adapter); std::map map; - PMP::connected_components(g, boost::make_assoc_property_map(map), CGAL::parameters::all_default()); + PMP::connected_components(g, boost::make_assoc_property_map(map)); Adapter fg(g, 0, boost::make_assoc_property_map(map)); face_iterator fit, fend; @@ -73,7 +73,7 @@ void test_edge_iterators(const Graph& g) typedef CGAL::Face_filtered_graph Adapter; CGAL_GRAPH_TRAITS_MEMBERS(Adapter); std::map map; - PMP::connected_components(g, boost::make_assoc_property_map(map), CGAL::parameters::all_default()); + PMP::connected_components(g, boost::make_assoc_property_map(map)); Adapter fg(g, 0, boost::make_assoc_property_map(map)); // do we iterate as many as that? @@ -99,7 +99,7 @@ void test_vertex_iterators(Graph& g) typedef CGAL::Face_filtered_graph Adapter; CGAL_GRAPH_TRAITS_MEMBERS(Adapter); std::map map; - PMP::connected_components(g, boost::make_assoc_property_map(map), CGAL::parameters::all_default()); + PMP::connected_components(g, boost::make_assoc_property_map(map)); Adapter fg(g, 0, boost::make_assoc_property_map(map)); vertex_iterator vb, ve; std::size_t count = 0; @@ -129,7 +129,7 @@ void test_out_edges(const Graph& g) typedef CGAL::Face_filtered_graph Adapter; CGAL_GRAPH_TRAITS_MEMBERS(Adapter); std::map map; - PMP::connected_components(g, boost::make_assoc_property_map(map), CGAL::parameters::all_default()); + PMP::connected_components(g, boost::make_assoc_property_map(map)); Adapter fg(g, 0, boost::make_assoc_property_map(map)); vertex_iterator vb, ve; @@ -158,7 +158,7 @@ void test_in_edges(const Graph& g) typedef CGAL::Face_filtered_graph Adapter; CGAL_GRAPH_TRAITS_MEMBERS(Adapter); std::map map; - PMP::connected_components(g, boost::make_assoc_property_map(map), CGAL::parameters::all_default()); + PMP::connected_components(g, boost::make_assoc_property_map(map)); Adapter fg(g, 0, boost::make_assoc_property_map(map)); vertex_iterator vb, ve; @@ -185,7 +185,7 @@ void test_in_out_edges(const Graph& g) typedef CGAL::Face_filtered_graph Adapter; CGAL_GRAPH_TRAITS_MEMBERS(Adapter); std::map map; - PMP::connected_components(g, boost::make_assoc_property_map(map), CGAL::parameters::all_default()); + PMP::connected_components(g, boost::make_assoc_property_map(map)); Adapter fg(g, 0, boost::make_assoc_property_map(map)); // check that the sets of in out edges are the same @@ -227,7 +227,7 @@ void test_edge_find(const Graph& g) typedef CGAL::Face_filtered_graph Adapter; CGAL_GRAPH_TRAITS_MEMBERS(Adapter); std::map map; - PMP::connected_components(g, boost::make_assoc_property_map(map), CGAL::parameters::all_default()); + PMP::connected_components(g, boost::make_assoc_property_map(map)); Adapter fg(g, 0, boost::make_assoc_property_map(map)); typedef std::pair ret; @@ -251,7 +251,7 @@ void test_faces(const Graph& g) typedef CGAL::Face_filtered_graph Adapter; CGAL_GRAPH_TRAITS_MEMBERS(Adapter); std::map map; - PMP::connected_components(g, boost::make_assoc_property_map(map), CGAL::parameters::all_default()); + PMP::connected_components(g, boost::make_assoc_property_map(map)); Adapter fg(g, 0, boost::make_assoc_property_map(map)); unsigned int count = 0; @@ -325,7 +325,7 @@ void test_read(const Graph& g) CGAL_GRAPH_TRAITS_MEMBERS(Adapter); std::map map; - PMP::connected_components(g, boost::make_assoc_property_map(map), CGAL::parameters::all_default()); + PMP::connected_components(g, boost::make_assoc_property_map(map)); Adapter fg(g, 0, boost::make_assoc_property_map(map)); assert(fg.is_selection_valid()); assert(CGAL::is_valid_polygon_mesh(fg)); diff --git a/Point_set_processing_3/test/Point_set_processing_3/test_deprecated_io_point_set.cpp b/Point_set_processing_3/test/Point_set_processing_3/test_deprecated_io_point_set.cpp index c968c046eec..3bf1032e669 100644 --- a/Point_set_processing_3/test/Point_set_processing_3/test_deprecated_io_point_set.cpp +++ b/Point_set_processing_3/test/Point_set_processing_3/test_deprecated_io_point_set.cpp @@ -119,14 +119,14 @@ int main() { std::ofstream os("tmp2.las", std::ios_base::binary); - CGAL::write_las_points(os, ps, CGAL::parameters::all_default()); + CGAL::write_las_points(os, ps); assert(ok); } { ps.clear(); std::ifstream is("tmp2.las", std::ios::binary); - ok = CGAL::read_las_points(is, std::back_inserter (ps),CGAL::parameters::all_default()); + ok = CGAL::read_las_points(is, std::back_inserter (ps)); assert(ok); assert(ps.size() == 3); } @@ -168,7 +168,7 @@ int main() { std::ofstream os("tmp2.ply"); assert(os.good()); - ok = CGAL::write_ply_points(os, ps, CGAL::parameters::all_default()); + ok = CGAL::write_ply_points(os, ps); assert(! os.fail()); assert(ok); } @@ -177,8 +177,7 @@ int main() std::ifstream is("tmp2.ply"); assert(is.good()); ps.clear(); - ok = CGAL::read_ply_points(is, std::back_inserter (ps), - CGAL::parameters::all_default()); + ok = CGAL::read_ply_points(is, std::back_inserter (ps)); assert(! is.fail()); assert(ok); assert(ps.size() == 3); @@ -188,7 +187,7 @@ int main() { std::ofstream os("tmp.off"); assert(os.good()); - ok = CGAL::write_off_points(os, ps, CGAL::parameters::all_default()); + ok = CGAL::write_off_points(os, ps); assert(! os.fail()); assert(ok); } @@ -197,8 +196,7 @@ int main() std::ifstream is("tmp.off"); assert(is.good()); ps.clear(); - ok = CGAL::read_off_points(is, std::back_inserter (ps), - CGAL::parameters::all_default()); + ok = CGAL::read_off_points(is, std::back_inserter (ps)); assert(! is.fail()); assert(ok); assert(ps.size() == 3); @@ -208,7 +206,7 @@ int main() { std::ofstream os("tmp.xyz"); assert(os.good()); - ok = CGAL::write_xyz_points(os, ps, CGAL::parameters::all_default()); + ok = CGAL::write_xyz_points(os, ps); assert(! os.fail()); assert(ok); } @@ -217,8 +215,7 @@ int main() std::ifstream is("tmp.xyz"); assert(is.good()); ps.clear(); - ok = CGAL::read_xyz_points(is, std::back_inserter (ps), - CGAL::parameters::all_default()); + ok = CGAL::read_xyz_points(is, std::back_inserter (ps)); assert(! is.fail()); assert(ok); assert(ps.size() == 3); diff --git a/Polyhedron/demo/Polyhedron/Plugins/IO/VTK_io_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/IO/VTK_io_plugin.cpp index 12616332198..120c5347bf3 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/IO/VTK_io_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/IO/VTK_io_plugin.cpp @@ -355,7 +355,7 @@ public: if(is_polygon_mesh) { FaceGraph* poly = new FaceGraph(); - if (CGAL::IO::internal::vtkPointSet_to_polygon_mesh(data, *poly, CGAL::parameters::all_default())) + if (CGAL::IO::internal::vtkPointSet_to_polygon_mesh(data, *poly)) { Scene_facegraph_item* poly_item = new Scene_facegraph_item(poly); if(group) diff --git a/Polyhedron/demo/Polyhedron/Plugins/PMP/Surface_intersection_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/PMP/Surface_intersection_plugin.cpp index b405b925f4a..b7549c61073 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/PMP/Surface_intersection_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/PMP/Surface_intersection_plugin.cpp @@ -310,8 +310,7 @@ void Polyhedron_demo_intersection_plugin::intersectionSurfacePolyline() PMP::internal::compute_face_polylines_intersection(faces(*itemA->face_graph()), polylines, *itemA->face_graph(), - std::back_inserter(poly_intersections), - CGAL::Polygon_mesh_processing::parameters::all_default()); + std::back_inserter(poly_intersections)); Q_FOREACH(const Poly_intersection& inter, poly_intersections) { diff --git a/Polyhedron/demo/Polyhedron/Scene_surface_mesh_item.cpp b/Polyhedron/demo/Polyhedron/Scene_surface_mesh_item.cpp index 6de2a6ae9f9..2475e0fe402 100644 --- a/Polyhedron/demo/Polyhedron/Scene_surface_mesh_item.cpp +++ b/Polyhedron/demo/Polyhedron/Scene_surface_mesh_item.cpp @@ -1937,8 +1937,7 @@ void Scene_surface_mesh_item::zoomToPosition(const QPoint &point, CGAL::Three::V //compute new position and orientation EPICK::Vector_3 face_normal = CGAL::Polygon_mesh_processing:: compute_face_normal(selected_fh, - *d->smesh_, - CGAL::Polygon_mesh_processing::parameters::all_default()); + *d->smesh_); double x(0), y(0), z(0), diff --git a/Surface_mesh_approximation/benchmark/Surface_mesh_approximation/vsa_timing_benchmark.cpp b/Surface_mesh_approximation/benchmark/Surface_mesh_approximation/vsa_timing_benchmark.cpp index d7216de3739..53bc7ac1462 100644 --- a/Surface_mesh_approximation/benchmark/Surface_mesh_approximation/vsa_timing_benchmark.cpp +++ b/Surface_mesh_approximation/benchmark/Surface_mesh_approximation/vsa_timing_benchmark.cpp @@ -76,7 +76,7 @@ int main(int argc, char *argv[]) t0.reset(); t0.start(); - approx.extract_mesh(CGAL::parameters::all_default()); + approx.extract_mesh(CGAL::parameters::use_default_values()); t0.stop(); std::cout << "meshing time " << t0.time() << " sec." << std::endl; diff --git a/Surface_mesh_parameterization/examples/Surface_mesh_parameterization/lscm.cpp b/Surface_mesh_parameterization/examples/Surface_mesh_parameterization/lscm.cpp index 4726357f23d..01954e162a8 100644 --- a/Surface_mesh_parameterization/examples/Surface_mesh_parameterization/lscm.cpp +++ b/Surface_mesh_parameterization/examples/Surface_mesh_parameterization/lscm.cpp @@ -76,7 +76,7 @@ int main(int argc, char** argv) UV_pmap uv_pm = sm.add_property_map("h:uv").first; // A halfedge on the (possibly virtual) border - halfedge_descriptor bhd = CGAL::Polygon_mesh_processing::longest_border(mesh, CGAL::Polygon_mesh_processing::parameters::all_default()).first; + halfedge_descriptor bhd = CGAL::Polygon_mesh_processing::longest_border(mesh).first; typedef SMP::Two_vertices_parameterizer_3 Border_parameterizer; typedef SMP::LSCM_parameterizer_3 Parameterizer; diff --git a/Surface_mesh_parameterization/examples/Surface_mesh_parameterization/orbifold.cpp b/Surface_mesh_parameterization/examples/Surface_mesh_parameterization/orbifold.cpp index 7ae125083dc..4dc4e2d0b6a 100644 --- a/Surface_mesh_parameterization/examples/Surface_mesh_parameterization/orbifold.cpp +++ b/Surface_mesh_parameterization/examples/Surface_mesh_parameterization/orbifold.cpp @@ -112,8 +112,7 @@ int main(int argc, char** argv) // a halfedge on the (possibly virtual) border // only used in output (will also be used to handle multiple connected components in the future) - halfedge_descriptor bhd = CGAL::Polygon_mesh_processing::longest_border(mesh, - CGAL::Polygon_mesh_processing::parameters::all_default()).first; + halfedge_descriptor bhd = CGAL::Polygon_mesh_processing::longest_border(mesh).first; parameterizer.parameterize(mesh, bhd, cmap, uvmap, vimap); diff --git a/Surface_mesh_parameterization/test/Surface_mesh_parameterization/extensive_parameterization_test.cpp b/Surface_mesh_parameterization/test/Surface_mesh_parameterization/extensive_parameterization_test.cpp index 51e9d38f718..a76f583f4f4 100644 --- a/Surface_mesh_parameterization/test/Surface_mesh_parameterization/extensive_parameterization_test.cpp +++ b/Surface_mesh_parameterization/test/Surface_mesh_parameterization/extensive_parameterization_test.cpp @@ -460,7 +460,7 @@ int main(int, char**) // a halfedge on the (possibly virtual) border // only used in output (will also be used to handle multiple connected components in the future) - SM_SE_halfedge_descriptor hd = PMP::longest_border(mesh, PMP::parameters::all_default()).first; + SM_SE_halfedge_descriptor hd = PMP::longest_border(mesh).first; SMP::Error_code status = parameterizer.parameterize(mesh, hd, cmap, uvmap, vimap);