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

minor improvements of tests

This commit is contained in:
Jane Tournois 2022-12-13 11:51:43 +01:00
parent efcebf2294
commit 5830d9a9ee
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Mesh_3/test/Mesh_3/test_meshing_determinism.cpp
View File

@ -68,7 +68,10 @@ void test()
// iterate // iterate
std::vector<std::string> output_c3t3; std::vector<std::string> output_c3t3;
std::vector<std::string> output_surfaces; std::vector<std::string> output_surfaces;
output_c3t3.reserve(5 * nb_runs);
const int nb_operations = 5;
output_c3t3.reserve(nb_operations * nb_runs);
for(std::size_t i = 0; i < nb_runs; ++i) for(std::size_t i = 0; i < nb_runs; ++i)
{ {
std::cout << "------- Iteration " << (i+1) << " -------" << std::endl; std::cout << "------- Iteration " << (i+1) << " -------" << std::endl;
@ -133,14 +136,16 @@ void test()
if(i == 0) if(i == 0)
continue; continue;
//else check //else check
for(std::size_t j = 0; j < 5; ++j) for(std::size_t j = 0; j < nb_operations; ++j)
{ {
if(0 != output_c3t3[5*(i-1)+j].compare(output_c3t3[5*i+j])) int id1 = nb_operations * (i - 1) + j;
int id2 = nb_operations * i + j;
if(0 != output_c3t3[id1].compare(output_c3t3[id2]))
{ {
std::cerr << "Meshing operation " << j << " is not deterministic.\n"; std::cerr << "Meshing operation " << j << " is not deterministic.\n";
assert(false); assert(false);
} }
if (0 != output_surfaces[5 * (i - 1) + j].compare(output_surfaces[5 * i + j])) if (0 != output_surfaces[id1].compare(output_surfaces[id2]))
{ {
std::cerr << "Output surface after operation " << j << " is not deterministic.\n"; std::cerr << "Output surface after operation " << j << " is not deterministic.\n";
assert(false); assert(false);
@ -151,8 +156,11 @@ void test()
int main(int, char*[]) int main(int, char*[])
{ {
std::cout << "Sequential test" << std::endl;
test<CGAL::Sequential_tag>(); test<CGAL::Sequential_tag>();
#ifdef CGAL_LINKED_WITH_TBB #ifdef CGAL_LINKED_WITH_TBB
std::cout << "\n\nParallel with 1 thread test" << std::endl;
tbb::global_control c(tbb::global_control::max_allowed_parallelism, 1); tbb::global_control c(tbb::global_control::max_allowed_parallelism, 1);
test<CGAL::Parallel_tag>(); test<CGAL::Parallel_tag>();
#endif #endif

3
Mesh_3/test/Mesh_3/test_meshing_without_features_determinism.cpp
View File

@ -149,8 +149,11 @@ void test()
int main(int, char*[]) int main(int, char*[])
{ {
std::cout << "Sequential test" << std::endl;
test<CGAL::Sequential_tag>(); test<CGAL::Sequential_tag>();
#ifdef CGAL_LINKED_WITH_TBB #ifdef CGAL_LINKED_WITH_TBB
std::cout << "\n\nParallel with 1 thread test" << std::endl;
tbb::global_control c(tbb::global_control::max_allowed_parallelism, 1); tbb::global_control c(tbb::global_control::max_allowed_parallelism, 1);
test<CGAL::Parallel_tag>(); test<CGAL::Parallel_tag>();
#endif #endif