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

Replaced x_at_limit and x_near_limit with x_on_boundary and x_near_boundary

This commit is contained in:
Efi Fogel 2017-11-26 13:49:22 +02:00
parent a9c2a49605
commit b5dd674505
2 changed files with 2 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Arrangement_on_surface_2/test/Arrangement_on_surface_2/cgal_test.cmake
View File

@ -93,8 +93,6 @@ set(ARE_MERGEABLE 10)
set(MERGE 11)
set(ASSERTIONS 12)
set(CONSTRUCTOR 13)
set(COMPARE_X_AT_LIMIT 14)
set(COMPARE_X_NEAR_LIMIT 15)
set(COMPARE_X_ON_BOUNDARY 16)
set(COMPARE_X_NEAR_BOUNDARY 17)
set(COMPARE_Y_NEAR_BOUNDARY 18)
@ -335,8 +333,6 @@ function(execute_commands_new_structure data_dir traits_type_name)
set(commands_indicator_COMPARE 0)
set(commands_indicator_VERTEX 0)
set(commands_indicator_IS_VERTICAL 0)
set(commands_indicator_COMPARE_X_AT_LIMIT 0)
set(commands_indicator_COMPARE_X_NEAR_LIMIT 0)
set(commands_indicator_COMPARE_X_ON_BOUNDARY 0)
set(commands_indicator_COMPARE_X_NEAR_BOUNDARY 0)
set(commands_indicator_COMPARE_Y_NEAR_BOUNDARY 0)
@ -374,14 +370,6 @@ function(execute_commands_new_structure data_dir traits_type_name)
run_trapped_test(test_traits data/${data_dir}/points
data/${data_dir}/xcurves data/${data_dir}/curves data/${data_dir}/is_vertical ${traits_type_name})
endif()
if(commands_indicator_COMPARE_X_AT_LIMIT)
run_trapped_test(test_traits data/${data_dir}/points
data/${data_dir}/xcurves data/${data_dir}/curves data/${data_dir}/compare_x_at_limit ${traits_type_name})
endif()
if(commands_indicator_COMPARE_X_NEAR_LIMIT)
run_trapped_test(test_traits data/${data_dir}/points
data/${data_dir}/xcurves data/${data_dir}/curves data/${data_dir}/compare_x_near_limit ${traits_type_name})
endif()
if(commands_indicator_COMPARE_X_ON_BOUNDARY)
run_trapped_test(test_traits data/${data_dir}/points
data/${data_dir}/xcurves data/${data_dir}/curves data/${data_dir}/compare_x_on_boundary ${traits_type_name})
@ -479,8 +467,6 @@ function(execute_commands_traits_adaptor data_dir traits_type_name)
set(commands_indicator_PARAMETER_SPACE_X 0)
set(commands_indicator_PARAMETER_SPACE_Y 0)
set(commands_indicator_COMPARE_X_AT_LIMIT 0)
set(commands_indicator_COMPARE_X_NEAR_LIMIT 0)
set(commands_indicator_COMPARE_X_ON_BOUNDARY 0)
set(commands_indicator_COMPARE_X_NEAR_BOUNDARY 0)
set(commands_indicator_COMPARE_Y_NEAR_BOUNDARY 0)
@ -508,16 +494,6 @@ function(execute_commands_traits_adaptor data_dir traits_type_name)
data/test_adaptor/${data_dir}/xcurves data/test_adaptor/${data_dir}/curves
data/test_adaptor/${data_dir}/parameter_space_y ${traits_type_name})
endif()
if(commands_indicator_COMPARE_X_AT_LIMIT)
run_trapped_test(test_traits_adaptor data/test_adaptor/${data_dir}/points
data/test_adaptor/${data_dir}/xcurves data/test_adaptor/${data_dir}/curves
data/test_adaptor/${data_dir}/compare_x_at_limit ${traits_type_name})
endif()
if(commands_indicator_COMPARE_X_NEAR_LIMIT)
run_trapped_test(test_traits_adaptor data/test_adaptor/${data_dir}/points
data/test_adaptor/${data_dir}/xcurves data/test_adaptor/${data_dir}/curves
data/test_adaptor/${data_dir}/compare_x_near_limit ${traits_type_name})
endif()
if(commands_indicator_COMPARE_X_ON_BOUNDARY)
run_trapped_test(test_traits_adaptor data/test_adaptor/${data_dir}/points
@ -1063,7 +1039,7 @@ function(test_linear_traits)
IS_VERTICAL COMPARE_Y_AT_X COMPARE_Y_AT_X_LEFT INTERSECT
SPLIT MERGE
PARAMETER_SPACE_X PARAMETER_SPACE_Y
COMPARE_X_AT_LIMIT COMPARE_X_NEAR_LIMIT COMPARE_Y_NEAR_BOUNDARY)
COMPARE_X_ON_BOUNDARY COMPARE_X_NEAR_BOUNDARY COMPARE_Y_NEAR_BOUNDARY)
endfunction()
#---------------------------------------------------------------------#
@ -1265,7 +1241,7 @@ function(test_rational_arc_traits)
execute_commands_new_structure(rational_arcs rational_arc_traits
VERTEX IS_VERTICAL COMPARE_Y_AT_X COMPARE_Y_AT_X_LEFT SPLIT MERGE
COMPARE_X_AT_LIMIT COMPARE_X_NEAR_LIMIT COMPARE_Y_NEAR_BOUNDARY)
COMPARE_X_ON_BOUNDARY COMPARE_X_NEAR_BOUNDARY COMPARE_Y_NEAR_BOUNDARY)
endfunction()
#---------------------------------------------------------------------#

2
Arrangement_on_surface_2/test/Arrangement_on_surface_2/cgal_test_base
View File

@ -100,8 +100,6 @@ ARE_MERGEABLE=10
MERGE=11
ASSERTIONS=12
CONSTRUCTOR=13
COMPARE_X_AT_LIMIT=14
COMPARE_X_NEAR_LIMIT=15
COMPARE_X_ON_BOUNDARY=16
COMPARE_X_NEAR_BOUNDARY=17
COMPARE_Y_NEAR_BOUNDARY=18