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

Misc minor cleaning/improvements to RT|FT kernel test

This commit is contained in:
Mael Rouxel-Labbé 2022-09-22 12:06:09 +02:00
parent 873cc884b5
commit c93e33c731
2 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Kernel_23/test/Kernel_23/CMakeLists.txt
View File

@ -35,8 +35,8 @@ create_single_source_cgal_program("test_Projection_traits_xy_3_Intersect_2.cpp")
set(CGAL_KERNEL_23_TEST_RT_FT_PREDICATE_FLAGS ON) set(CGAL_KERNEL_23_TEST_RT_FT_PREDICATE_FLAGS ON)
if(CGAL_KERNEL_23_TEST_RT_FT_PREDICATE_FLAGS) if(CGAL_KERNEL_23_TEST_RT_FT_PREDICATE_FLAGS)
# expensive because of templated operators creating a lot of possible combinations # templated operators create a lot of possible combinations, which is expensive to test
add_definitions(-DCGAL_KERNEL_23_TEST_RT_FT_PREDICATES_TEST_COMPARE_DISTANCES) add_definitions(-DCGAL_KERNEL_23_TEST_RT_FT_PREDICATES_TEST_PREDICATES_WITH_TEMPLATED_OPERATORS)
create_single_source_cgal_program("atomic_compilation_test.cpp") create_single_source_cgal_program("atomic_compilation_test.cpp")
create_single_source_cgal_program("test_RT_or_FT_predicates.cpp") create_single_source_cgal_program("test_RT_or_FT_predicates.cpp")

35
Kernel_23/test/Kernel_23/test_RT_or_FT_predicates.cpp
View File

@ -16,15 +16,15 @@
// > 8, everything // > 8, everything
#define CGAL_KERNEL_23_TEST_RT_FT_VERBOSITY 8 #define CGAL_KERNEL_23_TEST_RT_FT_VERBOSITY 8
std::vector<std::string> predicates_types = { }; std::vector<std::string> predicates_types = { "Angle_2" };
// @todo, technically somebody might in the future create predicates with non kernel objects (nor FT). // @todo, technically somebody could create predicates with non-kernel objects (nor FT/Origin), e.g. `int`.
// In that case, they'd have to be added to these lists since there is no scrapping of the predicate // In that case, these arguments would have to be added to the lists below since there is no scrapping
// arguments but rather try all combinations of objects from these lists. // of the predicate arguments, but simply trying all combinations of objects from these lists.
std::vector<std::string> object_types_2 = { "FT" }; std::vector<std::string> object_types_2 = { "FT", "Origin" };
std::vector<std::string> object_types_3 = { "FT" }; std::vector<std::string> object_types_3 = { "FT", "Origin" };
// @todo potential operator()s with more than MAX_ARITY are not tested // @todo potential operator()s with fewer than MIN_ARITY and more than MAX_ARITY are not tested
constexpr std::size_t MIN_ARITY = 0; constexpr std::size_t MIN_ARITY = 0;
constexpr std::size_t MAX_ARITY = 12; constexpr std::size_t MAX_ARITY = 12;
@ -82,6 +82,8 @@ std::string parameter_with_namespace(const std::string& FT_name,
return "CGAL::FT_necessary"; return "CGAL::FT_necessary";
else if(o == "FT") else if(o == "FT")
return "K::FT"; return "K::FT";
else if(o == "Origin")
return "CGAL::Origin";
else else
return "CGAL::" + o + "<" + kernel_with_FT(FT_name) + " >"; return "CGAL::" + o + "<" + kernel_with_FT(FT_name) + " >";
} }
@ -113,7 +115,7 @@ Compilation_result parse_output(const std::string& predicate_name,
return UNKNOWN; return UNKNOWN;
} }
#ifdef CGAL_KERNEL_23_TEST_RT_FT_PREDICATES_TEST_COMPARE_DISTANCES #ifdef CGAL_KERNEL_23_TEST_RT_FT_PREDICATES_TEST_PREDICATES_WITH_TEMPLATED_OPERATORS
// Compare_(squared)_distance_23 have templated operator()s, which are a lot of combinations to test. // Compare_(squared)_distance_23 have templated operator()s, which are a lot of combinations to test.
// In templated operator()s, the compare is simply a call to squared_distance()s and a CGAL::compare(). // In templated operator()s, the compare is simply a call to squared_distance()s and a CGAL::compare().
// Below prunes some exploration branches in case the first squared_distance() call does not even compile. // Below prunes some exploration branches in case the first squared_distance() call does not even compile.
@ -142,7 +144,7 @@ Compilation_result parse_output(const std::string& predicate_name,
} else if(line.find("too many arguments") != std::string::npos) { // @todo what is that exact error? } else if(line.find("too many arguments") != std::string::npos) { // @todo what is that exact error?
res = FAILED_NO_MATCH; res = FAILED_NO_MATCH;
break; break;
#ifdef CGAL_KERNEL_23_TEST_RT_FT_PREDICATES_TEST_COMPARE_DISTANCES #ifdef CGAL_KERNEL_23_TEST_RT_FT_PREDICATES_TEST_PREDICATES_WITH_TEMPLATED_OPERATORS
} else if(prune_compare_distance_branches && parameters.size() > 1 && } else if(prune_compare_distance_branches && parameters.size() > 1 &&
parameters[0] != "Any" && parameters[1] != "Any" && parameters[0] != "Any" && parameters[1] != "Any" &&
line.find(std::string{"no matching function for call to ‘squared_distance(const " + line.find(std::string{"no matching function for call to ‘squared_distance(const " +
@ -168,7 +170,8 @@ Compilation_result parse_output(const std::string& predicate_name,
res = SUCCESSFUL; res = SUCCESSFUL;
break; break;
} else if(line.find("undefined reference") != std::string::npos) { } else if(line.find("undefined reference") != std::string::npos) {
res = SUCCESSFUL; // @todo should it be a different value? // Can happen because the conversion Any -> kernel object is not implemented
res = SUCCESSFUL;
break; break;
} }
} }
@ -353,10 +356,11 @@ void test_predicate(const std::string& predicate_name,
for(const std::string& object_type : object_types) for(const std::string& object_type : object_types)
{ {
#ifdef CGAL_KERNEL_23_TEST_RT_FT_PREDICATES_TEST_COMPARE_DISTANCES #ifdef CGAL_KERNEL_23_TEST_RT_FT_PREDICATES_TEST_PREDICATES_WITH_TEMPLATED_OPERATORS
// This pruning could be done for other predicates, but they're not as expensive so it doesn't matter // This pruning could be done for other predicates, but they're not as expensive so it doesn't matter
if((predicate_name == "Compare_distance_2" || predicate_name == "Compare_distance_3" || if((predicate_name == "Compare_distance_2" || predicate_name == "Compare_distance_3" ||
predicate_name == "Compare_squared_distance_2" || predicate_name == "Compare_squared_distance_3") && predicate_name == "Compare_squared_distance_2" || predicate_name == "Compare_squared_distance_3" ||
predicate_name == "Do_intersect_2" || predicate_name == "Do_intersect_3") &&
object_type == "FT") object_type == "FT")
{ {
continue; continue;
@ -420,12 +424,13 @@ void test_predicate(const std::string& predicate_name)
std::cout << "\n\n=== Test predicate: " << predicate_name << "... ===" << std::endl; std::cout << "\n\n=== Test predicate: " << predicate_name << "... ===" << std::endl;
#endif #endif
#ifndef CGAL_KERNEL_23_TEST_RT_FT_PREDICATES_TEST_COMPARE_DISTANCES #ifndef CGAL_KERNEL_23_TEST_RT_FT_PREDICATES_TEST_PREDICATES_WITH_TEMPLATED_OPERATORS
if(predicate_name == "Compare_distance_2" || predicate_name == "Compare_distance_3" || if(predicate_name == "Compare_distance_2" || predicate_name == "Compare_distance_3" ||
predicate_name == "Compare_squared_distance_2" || predicate_name == "Compare_squared_distance_3") predicate_name == "Compare_squared_distance_2" || predicate_name == "Compare_squared_distance_3" ||
predicate_name == "Do_intersect_2" || predicate_name == "Do_intersect_3")
{ {
#if (CGAL_KERNEL_23_TEST_RT_FT_VERBOSITY > 1) #if (CGAL_KERNEL_23_TEST_RT_FT_VERBOSITY > 1)
std::cout << "Skipping because 'CGAL_KERNEL_23_TEST_RT_FT_PREDICATES_TEST_COMPARE_DISTANCES' is not defined!" << std::endl; std::cout << "Skipping because 'CGAL_KERNEL_23_TEST_RT_FT_PREDICATES_TEST_PREDICATES_WITH_TEMPLATED_OPERATORS' is not defined!" << std::endl;
#endif #endif
return; return;
} }