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

Merge pull request #4474 from sloriot/CGAL-warning_macro 

Update warning macro usages

# Conflicts:
#	Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Hole_filling/Triangulate_hole_polyline.h
This commit is contained in:
Laurent Rineau 2020-01-17 16:29:49 +01:00
parent 3b1f11dd0d b91c43ba54
commit 2c5826dd6f
17 changed files with 38 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Circular_kernel_3/include/CGAL/Circular_kernel_3/internal_functions_on_circle_3.h
View File

@ -179,7 +179,7 @@ namespace CGAL {
} }
break; break;
case BIPOLAR: case BIPOLAR:
CGAL_kernel_precondition(!"This function does not accept bipolar circle as input."); CGAL_kernel_precondition_msg(false, "This function does not accept bipolar circle as input.");
} }
return out_it; return out_it;
} }

2
Circular_kernel_3/include/CGAL/Circular_kernel_3/internal_functions_on_circular_arc_3.h
View File

@ -516,7 +516,7 @@ namespace CGAL {
break; break;
} }
case BIPOLAR: case BIPOLAR:
CGAL_kernel_precondition(!"This function does not accept bipolar circle as input."); CGAL_kernel_precondition_msg(false, "This function does not accept bipolar circle as input.");
} }
return out_it; return out_it;

2
Nef_3/include/CGAL/Nef_3/SNC_const_decorator.h
View File

@ -229,7 +229,7 @@ public:
if(!Infi_box::is_standard(hf->plane())) if(!Infi_box::is_standard(hf->plane()))
++i; ++i;
} }
CGAL_warning("altered code"); // CGAL_warning("altered code");
// CGAL_assertion(i>=6); // CGAL_assertion(i>=6);
return (i == 6); return (i == 6);
} }

4
Nef_3/include/CGAL/Nef_3/SNC_point_locator.h
View File

@ -884,7 +884,7 @@ public:
else CGAL_error_msg( "wrong handle type"); else CGAL_error_msg( "wrong handle type");
} }
CGAL_warning("altered code in SNC_point_locator"); //CGAL_warning("altered code in SNC_point_locator");
/* /*
Halffacet_iterator fc; Halffacet_iterator fc;
CGAL_forall_facets(fc, *this->sncp()) { CGAL_forall_facets(fc, *this->sncp()) {
@ -907,7 +907,7 @@ public:
if( CGAL::assign( v, result)) { if( CGAL::assign( v, result)) {
_CGAL_NEF_TRACEN("vertex hit, obtaining volume..." << v->point()); _CGAL_NEF_TRACEN("vertex hit, obtaining volume..." << v->point());
CGAL_warning("altered code in SNC_point_locator"); //CGAL_warning("altered code in SNC_point_locator");
SM_point_locator L(&*v); SM_point_locator L(&*v);
// Object_handle so = L.locate(s.source()-s.target(), true); // Object_handle so = L.locate(s.source()-s.target(), true);
Object_handle so = L.locate(s.source()-s.target()); Object_handle so = L.locate(s.source()-s.target());

2
Nef_3/include/CGAL/Nef_3/SNC_simplify.h
View File

@ -192,7 +192,7 @@ class SNC_simplify_base : public SNC_decorator<SNC_structure> {
} }
bool simplify_redundant_box_vertex(Vertex_handle v, bool snc_computed) { bool simplify_redundant_box_vertex(Vertex_handle v, bool snc_computed) {
CGAL_warning("altered code"); //CGAL_warning("altered code");
return false; return false;
if(snc_computed) return false; if(snc_computed) return false;
if(!Infi_box::is_redundant_box_vertex(*v)) return false; if(!Infi_box::is_redundant_box_vertex(*v)) return false;

8
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/Weights.h
View File

@ -55,8 +55,8 @@ struct Cotangent_value_Meyer_impl
if(divider == 0 /*|| divider != divider*/) if(divider == 0 /*|| divider != divider*/)
{ {
CGAL::collinear(get(ppmap, v0), get(ppmap, v1), get(ppmap, v2)) ? CGAL::collinear(get(ppmap, v0), get(ppmap, v1), get(ppmap, v2)) ?
CGAL_warning(!"Infinite Cotangent value with degenerate triangle!") : CGAL_warning_msg(false, "Infinite Cotangent value with degenerate triangle!") :
CGAL_warning(!"Infinite Cotangent value due to floating point arithmetic!"); CGAL_warning_msg(false, "Infinite Cotangent value due to floating point arithmetic!");
return dot_ab > 0 ? (std::numeric_limits<double>::max)() : return dot_ab > 0 ? (std::numeric_limits<double>::max)() :
@ -341,7 +341,7 @@ public:
} }
} }
} }
CGAL_warning(voronoi_area != 0 && "Zero voronoi area!"); CGAL_warning_msg(voronoi_area != 0, "Zero voronoi area!");
return voronoi_area; return voronoi_area;
} }
}; };
@ -806,7 +806,7 @@ public:
Vector v = target(he, pmesh())->point() - source(he, pmesh())->point(); Vector v = target(he, pmesh())->point() - source(he, pmesh())->point();
double divider = CGAL::sqrt(v.squared_length()); double divider = CGAL::sqrt(v.squared_length());
if(divider == 0.0) { if(divider == 0.0) {
CGAL_warning(!"Scale dependent weight - zero length edge."); CGAL_warning_msg(false, "Scale dependent weight - zero length edge.");
return (std::numeric_limits<double>::max)(); return (std::numeric_limits<double>::max)();
} }
return 1.0 / divider; return 1.0 / divider;

2
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Corefinement/Visitor.h
View File

@ -256,7 +256,7 @@ public:
void update_terminal_nodes(std::vector<bool>&) void update_terminal_nodes(std::vector<bool>&)
{ {
CGAL_assertion(!"This function should not be called"); CGAL_error_msg("This function should not be called");
} }
// The following code was used to split polylines at certains points. // The following code was used to split polylines at certains points.

2
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Corefinement/intersection_impl.h
View File

@ -704,7 +704,7 @@ class Intersection_of_triangle_meshes
switch(type){ switch(type){
case COPLANAR_TRIANGLES: case COPLANAR_TRIANGLES:
#ifndef DO_NOT_HANDLE_COPLANAR_FACES #ifndef DO_NOT_HANDLE_COPLANAR_FACES
assert(!"COPLANAR_TRIANGLES : this point should never be reached!"); CGAL_error_msg("COPLANAR_TRIANGLES : this point should never be reached!");
#else #else
//nothing needs to be done, cf. comments at the beginning of the file //nothing needs to be done, cf. comments at the beginning of the file
#endif #endif

2
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Hole_filling/Triangulate_hole_polygon_mesh.h
View File

@ -120,7 +120,7 @@ triangulate_hole_polygon_mesh(PolygonMesh& pmesh,
P_edges.push_back(*circ); P_edges.push_back(*circ);
if(!vertex_map.insert(std::make_pair(target(*circ,pmesh), id++)).second) { if(!vertex_map.insert(std::make_pair(target(*circ,pmesh), id++)).second) {
#ifndef CGAL_TEST_SUITE #ifndef CGAL_TEST_SUITE
CGAL_warning(!"Returning no output. Non-manifold vertex is found on boundary!"); CGAL_warning_msg(false, "Returning no output. Non-manifold vertex is found on boundary!");
#else #else
std::cerr << "W: Returning no output. Non-manifold vertex is found on boundary!\n"; std::cerr << "W: Returning no output. Non-manifold vertex is found on boundary!\n";
#endif #endif

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

@ -782,7 +782,7 @@ public:
boost::tuple<boost::optional<Edge>, bool, bool> res = construct_3D_triangulation(P, range, tr, edge_exist); boost::tuple<boost::optional<Edge>, bool, bool> res = construct_3D_triangulation(P, range, tr, edge_exist);
if(!res.template get<2>()) { if(!res.template get<2>()) {
#ifndef CGAL_TEST_SUITE #ifndef CGAL_TEST_SUITE
CGAL_warning(!"Returning no output. Dimension of 3D Triangulation is below 2!"); CGAL_warning_msg(false, "Returning no output. Dimension of 3D Triangulation is below 2!");
#else #else
std::cerr << "W: Returning no output. Dimension of 3D Triangulation is below 2!\n"; std::cerr << "W: Returning no output. Dimension of 3D Triangulation is below 2!\n";
#endif #endif
@ -806,7 +806,7 @@ public:
if(W.get(0, n-1) == Weight::NOT_VALID()) { if(W.get(0, n-1) == Weight::NOT_VALID()) {
#ifndef CGAL_TEST_SUITE #ifndef CGAL_TEST_SUITE
CGAL_warning(!"Returning no output. No possible triangulation is found!"); CGAL_warning_msg(false, "Returning no output. No possible triangulation is found!");
#else #else
std::cerr << "W: Returning no output. No possible triangulation is found!\n"; std::cerr << "W: Returning no output. No possible triangulation is found!\n";
#endif #endif
@ -1001,7 +1001,7 @@ private:
Triangulate_hole_polyline<Kernel, Tracer, WeightCalculator, LookupTable> all_space; Triangulate_hole_polyline<Kernel, Tracer, WeightCalculator, LookupTable> all_space;
all_space.triangulate_all(P, Q, WC, std::make_pair(h.first, h.second), W, lambda); all_space.triangulate_all(P, Q, WC, std::make_pair(h.first, h.second), W, lambda);
if(W.get(h.first, h.second) == Weight::NOT_VALID()) { if(W.get(h.first, h.second) == Weight::NOT_VALID()) {
CGAL_warning(!"Returning no output. Filling hole with incomplete patches is not successful!"); CGAL_warning_msg(false, "Returning no output. Filling hole with incomplete patches is not successful!");
return Weight::NOT_VALID(); return Weight::NOT_VALID();
} }
} }
@ -1022,7 +1022,7 @@ private:
Triangulate_hole_polyline<Kernel, Tracer, WeightCalculator, LookupTable> all_space; Triangulate_hole_polyline<Kernel, Tracer, WeightCalculator, LookupTable> all_space;
all_space.triangulate_all(P, Q, WC, std::make_pair(h.first, h.second), W, lambda); all_space.triangulate_all(P, Q, WC, std::make_pair(h.first, h.second), W, lambda);
if(W.get(h.first, h.second) == Weight::NOT_VALID()) { if(W.get(h.first, h.second) == Weight::NOT_VALID()) {
CGAL_warning(!"Returning no output. Filling hole with incomplete patches is not successful!"); CGAL_warning_msg(false, "Returning no output. Filling hole with incomplete patches is not successful!");
return Weight::NOT_VALID(); return Weight::NOT_VALID();
} }
} }
@ -1037,7 +1037,7 @@ private:
tr.clear(); tr.clear();
boost::tuple<boost::optional<Edge>, bool, bool> res = construct_3D_triangulation(P, h, tr, edge_exist); boost::tuple<boost::optional<Edge>, bool, bool> res = construct_3D_triangulation(P, h, tr, edge_exist);
if(!boost::get<0>(res)) { if(!boost::get<0>(res)) {
CGAL_warning(!"Returning no output. Filling hole with incomplete patches is not successful!"); CGAL_warning_msg(false, "Returning no output. Filling hole with incomplete patches is not successful!");
return Weight::NOT_VALID(); return Weight::NOT_VALID();
} }
start_edge = *boost::get<0>(res); start_edge = *boost::get<0>(res);
@ -1098,7 +1098,7 @@ private:
if(W.get(0, n-1) == Weight::NOT_VALID()) { if(W.get(0, n-1) == Weight::NOT_VALID()) {
#ifndef CGAL_TEST_SUITE #ifndef CGAL_TEST_SUITE
CGAL_warning(!"Returning no output using Delaunay triangulation.\n Falling back to the general Triangulation framework."); CGAL_warning_msg(false, "Returning no output using Delaunay triangulation.\n Falling back to the general Triangulation framework.");
#else #else
std::cerr << "W: Returning no output using Delaunay triangulation.\n" std::cerr << "W: Returning no output using Delaunay triangulation.\n"
<< "Falling back to the general Triangulation framework.\n"; << "Falling back to the general Triangulation framework.\n";
@ -1144,7 +1144,7 @@ public:
if(W.get(0,n-1) == Weight::NOT_VALID() || n <= 2) { if(W.get(0,n-1) == Weight::NOT_VALID() || n <= 2) {
#ifndef CGAL_TEST_SUITE #ifndef CGAL_TEST_SUITE
CGAL_warning(!"Returning no output. No possible triangulation is found!"); CGAL_warning_msg(false, "Returning no output. No possible triangulation is found!");
#else #else
std::cerr << "W: Returning no output. No possible triangulation is found!\n"; std::cerr << "W: Returning no output. No possible triangulation is found!\n";
#endif #endif

4
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Hole_filling/experimental/experimental_code.h
View File

@ -163,7 +163,7 @@ triangulate_hole_polyline_incomplete(InputIterator pbegin, InputIterator pend,
if(new_facets.empty()) { if(new_facets.empty()) {
// if no patch facets created and also we are using brute force approach, then there is nothing to do, // if no patch facets created and also we are using brute force approach, then there is nothing to do,
// leave `out` intact and return // leave `out` intact and return
CGAL_warning(!"Returning no output. Filling hole with incomplete patches is not successful!"); CGAL_warning_msg(false, "Returning no output. Filling hole with incomplete patches is not successful!");
return out; return out;
} }
} }
@ -212,7 +212,7 @@ triangulate_hole_Polyhedron_incomplete(Polyhedron& polyhedron,
if(patch_facets_before == patch_facets.size()) { if(patch_facets_before == patch_facets.size()) {
// if no patch facets created and also we are using brute force approach, then there is nothing to do, // if no patch facets created and also we are using brute force approach, then there is nothing to do,
// leave `out` intact and return // leave `out` intact and return
CGAL_warning(!"Returning no output. Filling hole with incomplete patches is not successful!"); CGAL_warning_msg(false, "Returning no output. Filling hole with incomplete patches is not successful!");
return std::make_pair(out, Weight_min_max_dihedral_and_area::NOT_VALID()); return std::make_pair(out, Weight_min_max_dihedral_and_area::NOT_VALID());
} }
} }

8
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/fair_impl.h
View File

@ -118,7 +118,7 @@ public:
{ {
int depth = static_cast<int>(fc) + 1; int depth = static_cast<int>(fc) + 1;
if(depth < 0 || depth > 3) { if(depth < 0 || depth > 3) {
CGAL_warning(!"Continuity should be between 0 and 2 inclusively!"); CGAL_warning_msg(false, "Continuity should be between 0 and 2 inclusively!");
return false; return false;
} }
@ -139,7 +139,7 @@ public:
for(vertex_descriptor vd : interior_vertices) for(vertex_descriptor vd : interior_vertices)
{ {
if( !vertex_id_map.insert(std::make_pair(vd, id)).second ) { if( !vertex_id_map.insert(std::make_pair(vd, id)).second ) {
CGAL_warning(!"Duplicate vertex is found!"); CGAL_warning_msg(false, "Duplicate vertex is found!");
return false; return false;
} }
++id; ++id;
@ -160,7 +160,7 @@ public:
double D; double D;
bool prefactor_ok = solver.factor(A, D); bool prefactor_ok = solver.factor(A, D);
if(!prefactor_ok) { if(!prefactor_ok) {
CGAL_warning(!"pre_factor failed!"); CGAL_warning_msg(false, "pre_factor failed!");
return false; return false;
} }
#ifdef CGAL_PMP_FAIR_DEBUG #ifdef CGAL_PMP_FAIR_DEBUG
@ -170,7 +170,7 @@ public:
// solve // solve
bool is_all_solved = solver.linear_solver(Bx, X) && solver.linear_solver(By, Y) && solver.linear_solver(Bz, Z); bool is_all_solved = solver.linear_solver(Bx, X) && solver.linear_solver(By, Y) && solver.linear_solver(Bz, Z);
if(!is_all_solved) { if(!is_all_solved) {
CGAL_warning(!"linear_solver failed!"); CGAL_warning_msg(false, "linear_solver failed!");
return false; return false;
} }
#ifdef CGAL_PMP_FAIR_DEBUG #ifdef CGAL_PMP_FAIR_DEBUG

3
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/orientation.h
View File

@ -168,8 +168,11 @@ bool is_outward_oriented(const PolygonMesh& pmesh,
CGAL_warning(CGAL::is_closed(pmesh)); CGAL_warning(CGAL::is_closed(pmesh));
CGAL_precondition(CGAL::is_valid_polygon_mesh(pmesh)); CGAL_precondition(CGAL::is_valid_polygon_mesh(pmesh));
#ifdef CGAL_PMP_DEBUG_CODE
//check for empty pmesh //check for empty pmesh
CGAL_warning(faces(pmesh).first != faces(pmesh).second); CGAL_warning(faces(pmesh).first != faces(pmesh).second);
#endif
if (faces(pmesh).first == faces(pmesh).second) if (faces(pmesh).first == faces(pmesh).second)
return true; return true;

2
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/repair.h
View File

@ -1856,7 +1856,7 @@ bool remove_degenerate_faces(const FaceRange& face_range,
if ( target(next(opposite(h_side1, tmesh), tmesh), tmesh) == if ( target(next(opposite(h_side1, tmesh), tmesh), tmesh) ==
target(next(opposite(h_side2, tmesh), tmesh), tmesh) ) target(next(opposite(h_side2, tmesh), tmesh), tmesh) )
{ {
CGAL_assertion(!"Forbidden simplification"); CGAL_error_msg("Forbidden simplification");
} }
h_side2 = prev(h_side2, tmesh); h_side2 = prev(h_side2, tmesh);

8
Polygon_mesh_processing/test/Polygon_mesh_processing/test_does_bound_a_volume.cpp
View File

@ -26,10 +26,10 @@ int main(int argc, char** argv)
Surface_mesh sm; Surface_mesh sm;
input >> sm; input >> sm;
bool res = atoi(argv[2*(i+1)])>0; bool res = atoi(argv[2*(i+1)])>0;
assert(!"Result is not as expected (input orientation)" || if (CGAL::Polygon_mesh_processing::does_bound_a_volume(sm)!=res)
CGAL::Polygon_mesh_processing::does_bound_a_volume(sm)==res); CGAL_error_msg("Result is not as expected (input orientation)");
CGAL::Polygon_mesh_processing::reverse_face_orientations(sm); CGAL::Polygon_mesh_processing::reverse_face_orientations(sm);
assert(!"Result is not as expected (reversed orientation)" || if (CGAL::Polygon_mesh_processing::does_bound_a_volume(sm)!=res)
CGAL::Polygon_mesh_processing::does_bound_a_volume(sm)==res); CGAL_error_msg("Result is not as expected (reversed orientation)");
} }
} }

6
Surface_mesh_segmentation/include/CGAL/internal/Surface_mesh_segmentation/SDF_calculation.h
View File

@ -280,7 +280,7 @@ public:
bool accept_if_acute, bool accept_if_acute,
const Disk_samples_list& disk_samples) const { const Disk_samples_list& disk_samples) const {
if(cone_angle < 0.0 || cone_angle > CGAL_PI) { if(cone_angle < 0.0 || cone_angle > CGAL_PI) {
CGAL_warning(false && "Cone angle is clamped between [0, CGAL_PI]."); CGAL_warning_msg(false, "Cone angle is clamped between [0, CGAL_PI].");
cone_angle = (std::min)(CGAL_PI, (std::max)(0.0, cone_angle)); cone_angle = (std::min)(CGAL_PI, (std::max)(0.0, cone_angle));
} }
@ -319,7 +319,7 @@ public:
Segment segment(center, target_point); Segment segment(center, target_point);
if(traits.is_degenerate_3_object()(segment)) { if(traits.is_degenerate_3_object()(segment)) {
CGAL_warning(false && CGAL_warning_msg(false,
"A degenerate segment is constructed. Most probable reason is using CGAL_PI as cone_angle parameter and also picking center of disk as a sample."); "A degenerate segment is constructed. Most probable reason is using CGAL_PI as cone_angle parameter and also picking center of disk as a sample.");
} }
@ -329,7 +329,7 @@ public:
Ray ray(center, ray_direction); Ray ray(center, ray_direction);
if(traits.is_degenerate_3_object()(ray)) { if(traits.is_degenerate_3_object()(ray)) {
CGAL_warning(false && CGAL_warning_msg(false,
"A degenerate ray is constructed. Most probable reason is using CGAL_PI as cone_angle parameter and also picking center of disk as a sample."); "A degenerate ray is constructed. Most probable reason is using CGAL_PI as cone_angle parameter and also picking center of disk as a sample.");
} }

2
Surface_mesh_segmentation/include/CGAL/internal/Surface_mesh_segmentation/Surface_mesh_segmentation.h
View File

@ -146,7 +146,7 @@ public:
boost::tie(min_sdf, max_sdf) = min_max_value(mesh, sdf_values); boost::tie(min_sdf, max_sdf) = min_max_value(mesh, sdf_values);
if(min_sdf == max_sdf) { if(min_sdf == max_sdf) {
CGAL_warning(min_sdf == max_sdf && !"Linear normalization is not applicable!"); CGAL_warning_msg(min_sdf == max_sdf, "Linear normalization is not applicable!");
return std::make_pair(min_sdf, max_sdf); return std::make_pair(min_sdf, max_sdf);
} }