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

Add progress tracking of the planar algorithm

This commit is contained in:
Andreas Fabri 2022-04-11 16:00:05 +01:00
parent 9f8897b84a
commit d6e6ce9dfb
3 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Polygon_mesh_processing/examples/Polygon_mesh_processing/hole_filling_example_SM.cpp
View File

@ -62,6 +62,16 @@ struct Progress {
Progress(const Progress&) = delete;
void start_planar_phase() const
{
std::cout << "Start planar phase"<< std::endl;
}
void end_planar_phase(bool success) const
{
std::cout << "End planar phase " << (success? "(success)" : "(failed)") << std::endl;
}
void start_quadratic_phase(int n)
{
timer.start();
@ -82,7 +92,7 @@ struct Progress {
void end_quadratic_phase(bool success) const
{
timer.stop();
std::cout << "End Quadratic phase " << timer.time() << " sec. " << (success ? "(success)" : "(falied)") << std::endl;
std::cout << "End Quadratic phase " << timer.time() << " sec. " << (success ? "(success)" : "(failed)") << std::endl;
timer.reset();
}

14
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Hole_filling/Triangulate_hole_polyline.h
View File

@ -1341,6 +1341,8 @@ triangulate_hole_polyline_with_cdt(const PointRange& points,
typedef typename Traits::Vector_3 Vector_3;
typedef typename Traits::Collinear_3 Collinear_3;
visitor.start_planar_phase();
// Compute an average normal of the hole.
const Collinear_3 collinear_3 =
traits.collinear_3_object();
@ -1383,6 +1385,7 @@ triangulate_hole_polyline_with_cdt(const PointRange& points,
if (num_normals < 1) {
// std::cerr << "WARNING: num normals, cdt 2 falls back to the original solution!" << std::endl;
visitor.end_planar_phase(false);
return false;
}
@ -1394,11 +1397,14 @@ triangulate_hole_polyline_with_cdt(const PointRange& points,
const Vector_3 avg_normal = Vector_3(x, y, z);
// std::cout << "avg normal: " << avg_normal << std::endl;
if (avg_normal==NULL_VECTOR) return false;
if (avg_normal==NULL_VECTOR){
visitor.end_planar_phase(false);
return false;
}
// Checking the hole planarity.
if (!is_planar_2(P, avg_normal, max_squared_distance, traits)) {
// std::cerr << "WARNING: planarity, cdt 2 falls back to the original solution!" << std::endl;
visitor.end_planar_phase(false);
return false;
}
@ -1407,6 +1413,7 @@ triangulate_hole_polyline_with_cdt(const PointRange& points,
const P_traits p_traits(avg_normal);
if (!is_simple_2(P.begin(), P.end() - 1, p_traits)) {
// std::cerr << "WARNING: simplicity, cdt 2 falls back to the original solution!" << std::endl;
visitor.end_planar_phase(false);
return false;
}
@ -1468,6 +1475,7 @@ triangulate_hole_polyline_with_cdt(const PointRange& points,
if (cdt.dimension() != 2 || cdt.number_of_vertices() != size) {
// std::cerr << "WARNING: dim + num vertices, cdt 2 falls back to the original solution!" << std::endl;
visitor.end_planar_phase(false);
return false;
}
@ -1485,6 +1493,7 @@ triangulate_hole_polyline_with_cdt(const PointRange& points,
lambda.put(is[0], is[2], is[1]);
if (!is_valid(P, is[0], is[1], is[2])) {
// std::cerr << "WARNING: validity, cdt 2 falls back to the original solution!" << std::endl;
visitor.end_planar_phase(false);
return false;
}
}
@ -1493,6 +1502,7 @@ triangulate_hole_polyline_with_cdt(const PointRange& points,
// Call the tracer. It correctly orients the patch faces.
// std::cout << "CDT is being used!" << std::endl;
tracer(lambda, 0, static_cast<int>(size) - 1);
visitor.end_planar_phase(true);
return true;
}

6
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangulate_hole.h
View File

@ -37,6 +37,12 @@ namespace Polygon_mesh_processing {
struct Hole_fill_visitor{
void start_planar_phase() const
{}
void end_planar_phase(bool) const
{}
void start_quadratic_phase(int /* N*/) const
{}