songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Do not call the deprecated functions

This commit is contained in:
Andreas Fabri 2022-05-17 10:12:28 +01:00
parent 58774ef301
commit c5ae4b7c53
6 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Generator/examples/Generator/random_points_on_triangle_mesh_2.cpp
View File

@ -44,7 +44,8 @@ int main()
cdt.insert_constraint(polygon2.vertices_begin(), polygon2.vertices_end(), true); cdt.insert_constraint(polygon2.vertices_begin(), polygon2.vertices_end(), true);
// Refine the triangulation (and mark the faces as inside/outside) // Refine the triangulation (and mark the faces as inside/outside)
CGAL::refine_Delaunay_mesh_2(cdt, Mesh_2_criteria(0.125, 0.5)); Mesh_2_criteria criteria(0.125, 0.5);
CGAL::refine_Delaunay_mesh_2(cdt, CGAL::parameters::criteria(criteria));
// Create the generator, input is the Triangulation_2 cdt // Create the generator, input is the Triangulation_2 cdt
Random_points_in_triangle_mesh_2<Point, CDT> g(cdt); Random_points_in_triangle_mesh_2<Point, CDT> g(cdt);

3
Generator/test/Generator/generic_random_test.cpp
View File

@ -157,7 +157,8 @@ int test_T2(const FT eps)
cdt.insert(Point_2(-1,3)); cdt.insert(Point_2(-1,3));
// Refine the triangulation // Refine the triangulation
CGAL::refine_Delaunay_mesh_2(cdt, Mesh_2_criteria(0.125, 0.5)); Mesh_2_criteria criteria(0.125, 0.5);
CGAL::refine_Delaunay_mesh_2(cdt, CGAL::parameters::criteria(criteria));
CGAL::Random_points_in_triangle_mesh_2<Point_2, CDT> g(cdt); CGAL::Random_points_in_triangle_mesh_2<Point_2, CDT> g(cdt);
std::copy_n(g, 300, std::back_inserter(points)); std::copy_n(g, 300, std::back_inserter(points));

3
Mesh_2/test/Mesh_2/test_mesh_projection_traits.cpp
View File

@ -37,7 +37,8 @@ int main()
std::cout << "Number of vertices: " << cdt.number_of_vertices() << std::endl; std::cout << "Number of vertices: " << cdt.number_of_vertices() << std::endl;
std::cout << "Meshing the triangulation..." << std::endl; std::cout << "Meshing the triangulation..." << std::endl;
CGAL::refine_Delaunay_mesh_2(cdt, Criteria(0.125, 0.5, gt)); Criteria criteria(0.125, 0.5, gt);
CGAL::refine_Delaunay_mesh_2(cdt, CGAL::parameters::criteria(criteria));
std::cout << "Number of vertices: " << cdt.number_of_vertices() << std::endl; std::cout << "Number of vertices: " << cdt.number_of_vertices() << std::endl;
} }

3
Mesh_2/test/Mesh_2/test_mesh_terrain.cpp
View File

@ -34,7 +34,8 @@ int main()
dt.insert_constraint(vc, vd); dt.insert_constraint(vc, vd);
dt.insert_constraint(vd, va); dt.insert_constraint(vd, va);
CGAL::refine_Delaunay_mesh_2(dt, Criteria(0.125, 0.5)); Criteria criteria(0.125, 0.5);
CGAL::refine_Delaunay_mesh_2(dt, CGAL::parameters::criteria(criteria));
// dt.insert(begin, end); // dt.insert(begin, end);
std::cout << dt.number_of_vertices() << std::endl; std::cout << dt.number_of_vertices() << std::endl;
return 0; return 0;

20
Mesh_2/test/Mesh_2/test_meshing.cpp
View File

@ -72,8 +72,8 @@ struct Tester2 {
std::cerr << "Meshing the triangulation with size 0..."; std::cerr << "Meshing the triangulation with size 0...";
CGAL::refine_Delaunay_mesh_2(cdt, CGAL::refine_Delaunay_mesh_2(cdt,
seeds.begin(), seeds.end(), CGAL::parameters::seeds(seeds)
Criteria()); .criteria(Criteria()));
const size_type number_of_vertices0 = cdt.number_of_vertices(); const size_type number_of_vertices0 = cdt.number_of_vertices();
std::cerr << " done.\nNumber of vertices: " << cdt.number_of_vertices() << "\n\n"; std::cerr << " done.\nNumber of vertices: " << cdt.number_of_vertices() << "\n\n";
assert( 64 <= cdt.number_of_vertices() && assert( 64 <= cdt.number_of_vertices() &&
@ -82,8 +82,8 @@ struct Tester2 {
std::cerr << "Meshing the triangulation with size 0.2..."; std::cerr << "Meshing the triangulation with size 0.2...";
CGAL::refine_Delaunay_mesh_2(cdt, CGAL::refine_Delaunay_mesh_2(cdt,
seeds.begin(), seeds.end(), CGAL::parameters::seeds(seeds)
Criteria(0.125, 0.2)); .criteria(Criteria(0.125, 0.2)));
std::cerr << " done.\nNumber of vertices: " << cdt.number_of_vertices() << "\n\n"; std::cerr << " done.\nNumber of vertices: " << cdt.number_of_vertices() << "\n\n";
assert( 190 <= cdt.number_of_vertices() && assert( 190 <= cdt.number_of_vertices() &&
@ -91,8 +91,8 @@ struct Tester2 {
std::cerr << "Meshing the triangulation with size 0.1..."; std::cerr << "Meshing the triangulation with size 0.1...";
CGAL::refine_Delaunay_mesh_2(cdt, CGAL::refine_Delaunay_mesh_2(cdt,
seeds.begin(), seeds.end(), CGAL::parameters::seeds(seeds)
Criteria(0.125, 0.1)); .criteria(Criteria(0.125, 0.1)));
const size_type number_of_vertices1 = cdt.number_of_vertices(); const size_type number_of_vertices1 = cdt.number_of_vertices();
std::cerr << " done.\nNumber of vertices: " << cdt.number_of_vertices() << "\n\n"; std::cerr << " done.\nNumber of vertices: " << cdt.number_of_vertices() << "\n\n";
assert( 580 <= cdt.number_of_vertices() && assert( 580 <= cdt.number_of_vertices() &&
@ -104,8 +104,8 @@ struct Tester2 {
std::cerr << "Meshing the triangulation with Delaunay_mesh_criteria_2<CDT>()..."; std::cerr << "Meshing the triangulation with Delaunay_mesh_criteria_2<CDT>()...";
CGAL::refine_Delaunay_mesh_2(cdt, CGAL::refine_Delaunay_mesh_2(cdt,
seeds.begin(), seeds.end(), CGAL::parameters::seeds(seeds).
CGAL::Delaunay_mesh_criteria_2<CDT>()); criteria(CGAL::Delaunay_mesh_criteria_2<CDT>()));
const size_type number_of_vertices0bis = cdt.number_of_vertices(); const size_type number_of_vertices0bis = cdt.number_of_vertices();
std::cerr << " done.\nNumber of vertices: " << cdt.number_of_vertices() << "\n\n"; std::cerr << " done.\nNumber of vertices: " << cdt.number_of_vertices() << "\n\n";
@ -121,8 +121,8 @@ struct Tester2 {
std::cerr << "Meshing the triangulation with size 0.1, with " std::cerr << "Meshing the triangulation with size 0.1, with "
<< "refine_Delaunay_mesh_2()..."; << "refine_Delaunay_mesh_2()...";
CGAL::refine_Delaunay_mesh_2(cdt, CGAL::refine_Delaunay_mesh_2(cdt,
seeds.begin(), seeds.end(), CGAL::parameters::seeds(seeds)
Criteria(0.125, 0.1)); .criteria(Criteria(0.125, 0.1)));
const size_type number_of_vertices1bis = cdt.number_of_vertices(); const size_type number_of_vertices1bis = cdt.number_of_vertices();
std::cerr << " done.\nNumber of vertices: " << cdt.number_of_vertices() std::cerr << " done.\nNumber of vertices: " << cdt.number_of_vertices()
<< "\n\n"; << "\n\n";

3
Mesh_2/test/Mesh_2/test_meshing_user_bug_test_case.cpp
View File

@ -57,7 +57,8 @@ int main()
std::cout << "Number of vertices: " << cdt.number_of_vertices() << std::endl; std::cout << "Number of vertices: " << cdt.number_of_vertices() << std::endl;
std::cout << "Meshing the triangulation..." << std::endl; std::cout << "Meshing the triangulation..." << std::endl;
CGAL::refine_Delaunay_mesh_2(cdt, Criteria(0.125, 1.0)); Criteria criteria(0.125, 0.5);
CGAL::refine_Delaunay_mesh_2(cdt, CGAL::parameters::criteria(criteria));
std::cout << "Number of vertices: " << cdt.number_of_vertices() << std::endl; std::cout << "Number of vertices: " << cdt.number_of_vertices() << std::endl;
} }