fixed number of regions in tests

This commit is contained in:
Sven Oesau 2022-05-24 15:43:00 +02:00
parent dd2774391b
commit da14e50a45
9 changed files with 18 additions and 20 deletions

View File

@ -68,13 +68,13 @@ bool test_region_growing_on_degenerated_mesh(int argc, char *argv[]) {
std::vector< std::vector<std::size_t> > 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<std::size_t> unassigned_faces;
region_growing.unassigned_items(std::back_inserter(unassigned_faces));
assert(unassigned_faces.size() == 503);
assert(unassigned_faces.size() == 509);
return true;
}

View File

@ -73,13 +73,13 @@ bool test_region_growing_on_point_set_2(int argc, char *argv[]) {
std::vector< std::vector<std::size_t> > 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<std::size_t> unassigned_points;
region_growing.unassigned_items(std::back_inserter(unassigned_points));
assert(unassigned_points.size() == 87);
assert(unassigned_points.size() == 86);
return true;
}

View File

@ -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;

View File

@ -71,13 +71,13 @@ bool test_region_growing_on_point_set_3(int argc, char *argv[]) {
std::vector< std::vector<std::size_t> > 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<std::size_t> unassigned_points;
region_growing.unassigned_items(std::back_inserter(unassigned_points));
assert(unassigned_points.size() == 196);
assert(unassigned_points.size() == 246);
return true;
}

View File

@ -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);
}
);

View File

@ -68,13 +68,13 @@ bool test_region_growing_on_polygon_mesh(int argc, char *argv[]) {
std::vector< std::vector<std::size_t> > 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<std::size_t> unassigned_faces;
region_growing.unassigned_items(std::back_inserter(unassigned_faces));
assert(unassigned_faces.size() == 918);
assert(unassigned_faces.size() == 992);
return true;
}

View File

@ -76,7 +76,7 @@ int main(int argc, char *argv[]) {
std::vector< std::vector<std::size_t> > 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;

View File

@ -76,7 +76,7 @@ bool test_region_growing_on_polyline(int argc, char *argv[]) {
std::vector< std::vector<std::size_t> > 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));

View File

@ -81,13 +81,11 @@ int main(int argc, char *argv[]) {
std::vector< std::vector<std::size_t> > 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<std::size_t> 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.