diff --git a/Shape_detection/test/Shape_detection/test_region_growing_on_degenerated_mesh.cpp b/Shape_detection/test/Shape_detection/test_region_growing_on_degenerated_mesh.cpp index 7ec5c5595a7..81ebc3acf43 100644 --- a/Shape_detection/test/Shape_detection/test_region_growing_on_degenerated_mesh.cpp +++ b/Shape_detection/test/Shape_detection/test_region_growing_on_degenerated_mesh.cpp @@ -68,13 +68,13 @@ bool test_region_growing_on_degenerated_mesh(int argc, char *argv[]) { std::vector< std::vector > regions; region_growing.detect(std::back_inserter(regions)); - assert(regions.size() == 262); + assert(regions.size() == 296); for (const auto& region : regions) assert(region_type.is_valid_region(region)); std::vector unassigned_faces; region_growing.unassigned_items(std::back_inserter(unassigned_faces)); - assert(unassigned_faces.size() == 503); + assert(unassigned_faces.size() == 509); return true; } diff --git a/Shape_detection/test/Shape_detection/test_region_growing_on_point_set_2.cpp b/Shape_detection/test/Shape_detection/test_region_growing_on_point_set_2.cpp index 17fa16ed2e1..fc076e15006 100644 --- a/Shape_detection/test/Shape_detection/test_region_growing_on_point_set_2.cpp +++ b/Shape_detection/test/Shape_detection/test_region_growing_on_point_set_2.cpp @@ -73,13 +73,13 @@ bool test_region_growing_on_point_set_2(int argc, char *argv[]) { std::vector< std::vector > regions; region_growing.detect(std::back_inserter(regions)); - assert(regions.size() == 65); + assert(regions.size() == 72); for (const auto& region : regions) assert(region_type.is_valid_region(region)); std::vector unassigned_points; region_growing.unassigned_items(std::back_inserter(unassigned_points)); - assert(unassigned_points.size() == 87); + assert(unassigned_points.size() == 86); return true; } diff --git a/Shape_detection/test/Shape_detection/test_region_growing_on_point_set_2_with_sorting.cpp b/Shape_detection/test/Shape_detection/test_region_growing_on_point_set_2_with_sorting.cpp index 6907d59593b..c05b75133b2 100644 --- a/Shape_detection/test/Shape_detection/test_region_growing_on_point_set_2_with_sorting.cpp +++ b/Shape_detection/test/Shape_detection/test_region_growing_on_point_set_2_with_sorting.cpp @@ -97,7 +97,7 @@ bool test(int argc, char** argv, const std::string name, const std::size_t minr, minimum_region_size(min_region_size). point_map(Point_map()). normal_map(Normal_map())); - assert(regions.size() == 62); + assert(regions.size() == 65); } const bool success = true; diff --git a/Shape_detection/test/Shape_detection/test_region_growing_on_point_set_3.cpp b/Shape_detection/test/Shape_detection/test_region_growing_on_point_set_3.cpp index 829bc9aa1af..14abcf7534e 100644 --- a/Shape_detection/test/Shape_detection/test_region_growing_on_point_set_3.cpp +++ b/Shape_detection/test/Shape_detection/test_region_growing_on_point_set_3.cpp @@ -71,13 +71,13 @@ bool test_region_growing_on_point_set_3(int argc, char *argv[]) { std::vector< std::vector > regions; region_growing.detect(std::back_inserter(regions)); - assert(regions.size() == 9); + assert(regions.size() == 10); for (const auto& region : regions) assert(region_type.is_valid_region(region)); std::vector unassigned_points; region_growing.unassigned_items(std::back_inserter(unassigned_points)); - assert(unassigned_points.size() == 196); + assert(unassigned_points.size() == 246); return true; } diff --git a/Shape_detection/test/Shape_detection/test_region_growing_on_point_set_3_with_sorting.cpp b/Shape_detection/test/Shape_detection/test_region_growing_on_point_set_3_with_sorting.cpp index 5b283f8d95f..6ab6164c696 100644 --- a/Shape_detection/test/Shape_detection/test_region_growing_on_point_set_3_with_sorting.cpp +++ b/Shape_detection/test/Shape_detection/test_region_growing_on_point_set_3_with_sorting.cpp @@ -145,7 +145,7 @@ int main(int argc, char *argv[]) { }, [](const auto& region) -> bool { std::cout << "- num regions spheres: " << region.size() << std::endl; - return (region.size() >= 30 && region.size() <= 77); + return (region.size() >= 6 && region.size() <= 7); } ); @@ -167,7 +167,7 @@ int main(int argc, char *argv[]) { }, [](const auto& region) -> bool { std::cout << "- num regions cylinders: " << region.size() << std::endl; - return (region.size() >= 4 && region.size() <= 14); + return (region.size() >= 13 && region.size() <= 16); } ); diff --git a/Shape_detection/test/Shape_detection/test_region_growing_on_polygon_mesh.cpp b/Shape_detection/test/Shape_detection/test_region_growing_on_polygon_mesh.cpp index 6f78c693ec4..a6c0e327951 100644 --- a/Shape_detection/test/Shape_detection/test_region_growing_on_polygon_mesh.cpp +++ b/Shape_detection/test/Shape_detection/test_region_growing_on_polygon_mesh.cpp @@ -68,13 +68,13 @@ bool test_region_growing_on_polygon_mesh(int argc, char *argv[]) { std::vector< std::vector > regions; region_growing.detect(std::back_inserter(regions)); - assert(regions.size() == 329); + assert(regions.size() == 414); for (const auto& region : regions) assert(region_type.is_valid_region(region)); std::vector unassigned_faces; region_growing.unassigned_items(std::back_inserter(unassigned_faces)); - assert(unassigned_faces.size() == 918); + assert(unassigned_faces.size() == 992); return true; } diff --git a/Shape_detection/test/Shape_detection/test_region_growing_on_polygon_mesh_with_sorting.cpp b/Shape_detection/test/Shape_detection/test_region_growing_on_polygon_mesh_with_sorting.cpp index ad5397b58d5..f0404df711b 100644 --- a/Shape_detection/test/Shape_detection/test_region_growing_on_polygon_mesh_with_sorting.cpp +++ b/Shape_detection/test/Shape_detection/test_region_growing_on_polygon_mesh_with_sorting.cpp @@ -76,7 +76,7 @@ int main(int argc, char *argv[]) { std::vector< std::vector > regions; region_growing.detect(std::back_inserter(regions)); region_growing.clear(); - assert(regions.size() == 326); + assert(regions.size() == 355); // Test free functions and stability. for (std::size_t k = 0; k < 3; ++k) { @@ -88,7 +88,7 @@ int main(int argc, char *argv[]) { maximum_angle(angle_threshold). minimum_region_size(min_region_size). vertex_point_map(vertex_to_point_map)); - assert(regions.size() == 326); + assert(regions.size() == 355); } std::cout << "rg_sortfaces3, epeck_test_success: " << true << std::endl; diff --git a/Shape_detection/test/Shape_detection/test_region_growing_on_polyline.cpp b/Shape_detection/test/Shape_detection/test_region_growing_on_polyline.cpp index c429fc3dbd7..d1f11f83578 100644 --- a/Shape_detection/test/Shape_detection/test_region_growing_on_polyline.cpp +++ b/Shape_detection/test/Shape_detection/test_region_growing_on_polyline.cpp @@ -76,7 +76,7 @@ bool test_region_growing_on_polyline(int argc, char *argv[]) { std::vector< std::vector > regions; region_growing_3.detect(std::back_inserter(regions)); - assert(regions.size() == 12); + assert(regions.size() == 17); for (const auto& region : regions) assert(region_type_3.is_valid_region(region)); @@ -113,7 +113,7 @@ bool test_region_growing_on_polyline(int argc, char *argv[]) { regions.clear(); region_growing_2.detect(std::back_inserter(regions)); - assert(regions.size() == 4); + assert(regions.size() == 5); for (const auto& region : regions) assert(region_type_2.is_valid_region(region)); diff --git a/Shape_detection/test/Shape_detection/test_region_growing_on_polyline_with_sorting.cpp b/Shape_detection/test/Shape_detection/test_region_growing_on_polyline_with_sorting.cpp index d19ed2f9b82..07fc62d9d48 100644 --- a/Shape_detection/test/Shape_detection/test_region_growing_on_polyline_with_sorting.cpp +++ b/Shape_detection/test/Shape_detection/test_region_growing_on_polyline_with_sorting.cpp @@ -81,13 +81,11 @@ int main(int argc, char *argv[]) { std::vector< std::vector > regions; region_growing_3.detect(std::back_inserter(regions)); - assert(regions.size() == 15); - for (const auto& region : regions) - assert(region_type_3.is_valid_region(region)); + assert(regions.size() == 16); std::vector unassigned_points; region_growing_3.unassigned_items(std::back_inserter(unassigned_points)); - assert(unassigned_points.size() == 0); + assert(unassigned_points.size() == 1); // Test free functions and stability. for (std::size_t k = 0; k < 3; ++k) { @@ -97,7 +95,7 @@ int main(int argc, char *argv[]) { CGAL::parameters:: maximum_distance(distance_threshold). maximum_angle(angle_threshold)); - assert(regions.size() == 15); + assert(regions.size() == 16); } // Create 2D polyline.