diff --git a/Surface_mesh_simplification/include/CGAL/internal/robust_cross_product.h b/Surface_mesh_simplification/include/CGAL/internal/robust_cross_product.h index 9dbb4f460ef..ea3b05fbcd2 100644 --- a/Surface_mesh_simplification/include/CGAL/internal/robust_cross_product.h +++ b/Surface_mesh_simplification/include/CGAL/internal/robust_cross_product.h @@ -18,7 +18,7 @@ namespace CGAL::Surface_mesh_simplification::internal{ -// a*b - c*d + // a*b - c*d // The next two functions are from https://stackoverflow.com/questions/63665010/accurate-floating-point-computation-of-the-sum-and-difference-of-two-products inline double diff_of_products_kahan(const double a, const double b, const double c, const double d) { diff --git a/Surface_mesh_simplification/test/Surface_mesh_simplification/data/issue_8213.off b/Surface_mesh_simplification/test/Surface_mesh_simplification/data/issue_8213.off index 4669828bf08..14e2cf1fbe3 100644 --- a/Surface_mesh_simplification/test/Surface_mesh_simplification/data/issue_8213.off +++ b/Surface_mesh_simplification/test/Surface_mesh_simplification/data/issue_8213.off @@ -1,16 +1,13 @@ OFF 5 4 0 - 0.60153250345565623 3.2925554343503594 -0.93390733763467004 - 0.50125687092531912 3.266008536541555 -0.80580753798383942 - 0.57499779785916183 3.2558452065056969 -0.97860403852322797 - 0.56586410588624558 3.2541065339825863 -0.99341202997519495 - 0.56756366821062887 3.2478315549358072 -0.99100621040927039 - - 3 0 1 2 - 3 1 3 2 - 3 1 0 3 - 3 0 4 3 - - +0.60153250345565623 3.2925554343503594 -0.93390733763467004 +0.50125687092531912 3.266008536541555 -0.80580753798383942 +0.57499779785916183 3.2558452065056969 -0.97860403852322797 +0.56586410588624558 3.2541065339825863 -0.99341202997519495 +0.56756366821062887 3.2478315549358072 -0.99100621040927039 +3 0 1 2 +3 1 3 2 +3 1 0 3 +3 0 4 3 diff --git a/Surface_mesh_simplification/test/Surface_mesh_simplification/issue_8213.cpp b/Surface_mesh_simplification/test/Surface_mesh_simplification/issue_8213.cpp index d8bd43e4a74..24f89279cf8 100644 --- a/Surface_mesh_simplification/test/Surface_mesh_simplification/issue_8213.cpp +++ b/Surface_mesh_simplification/test/Surface_mesh_simplification/issue_8213.cpp @@ -3,8 +3,6 @@ #include -CGAL::Bbox_3 bbox_g; -double max_bbox_g; #define CGAL_CHECK_EXPENSIVE #define CGAL_SURFACE_SIMPLIFICATION_ENABLE_TRACE 5 @@ -17,7 +15,6 @@ void Surface_simplification_external_trace(const std::string& s) #include #include -// #include #include #include #include @@ -50,20 +47,15 @@ int main(int argc, char** argv) return EXIT_FAILURE; } - auto bb=PMP::bbox(sm); + CGAL::Bbox_3 bb = PMP::bbox(sm); std::cout << "Bbox:" << bb << std::endl; std::cout << "Input mesh has " << num_vertices(sm) << " vertices" << std::endl; std::cout << "Input mesh has " << num_faces(sm) << " faces" << std::endl; - SMS::Face_count_stop_predicate stop(1); - SMS::edge_collapse( - sm, - stop, - CGAL::parameters:: - // filter(SMS::Bounded_normal_change_filter<>()) //>(SMS::Bounding_box_filter<>())) - get_cost(SMS::LindstromTurk_cost()) - .get_placement(SMS::LindstromTurk_placement()) + SMS::edge_collapse(sm, stop, + CGAL::parameters::get_cost(SMS::LindstromTurk_cost()) + .get_placement(SMS::LindstromTurk_placement()) ); CGAL::IO::write_OFF(std::cout, sm, CGAL::parameters::stream_precision(17));