mirror of https://github.com/CGAL/cgal
Regroup and complete BGL named parameters tests
Along the way, apply the same fix as in f191e6114a
(*_sampling should be named use_*_sampling)
This commit is contained in:
Mael Rouxel-Labbé
parent
32be118022
commit
638bfee3fd
|
|
@ -20,9 +20,9 @@
|
||||||
|
|
||||||
// List of named parameters that we use in CGAL
|
// List of named parameters that we use in CGAL
|
||||||
CGAL_add_named_parameter(vertex_point_t, vertex_point, vertex_point_map)
|
CGAL_add_named_parameter(vertex_point_t, vertex_point, vertex_point_map)
|
||||||
CGAL_add_named_parameter(face_index_t, face_index, face_index_map)
|
|
||||||
CGAL_add_named_parameter(edge_index_t, edge_index, edge_index_map)
|
|
||||||
CGAL_add_named_parameter(halfedge_index_t, halfedge_index, halfedge_index_map)
|
CGAL_add_named_parameter(halfedge_index_t, halfedge_index, halfedge_index_map)
|
||||||
|
CGAL_add_named_parameter(edge_index_t, edge_index, edge_index_map)
|
||||||
|
CGAL_add_named_parameter(face_index_t, face_index, face_index_map)
|
||||||
|
|
||||||
CGAL_add_named_parameter(edge_is_constrained_t, edge_is_constrained, edge_is_constrained_map)
|
CGAL_add_named_parameter(edge_is_constrained_t, edge_is_constrained, edge_is_constrained_map)
|
||||||
CGAL_add_named_parameter(first_index_t, first_index, first_index)
|
CGAL_add_named_parameter(first_index_t, first_index, first_index)
|
||||||
|
|
@ -43,9 +43,9 @@ CGAL_add_named_parameter(protect_constraints_t, protect_constraints, protect_con
|
||||||
CGAL_add_named_parameter(relax_constraints_t, relax_constraints, relax_constraints)
|
CGAL_add_named_parameter(relax_constraints_t, relax_constraints, relax_constraints)
|
||||||
CGAL_add_named_parameter(vertex_is_constrained_t, vertex_is_constrained, vertex_is_constrained_map)
|
CGAL_add_named_parameter(vertex_is_constrained_t, vertex_is_constrained, vertex_is_constrained_map)
|
||||||
CGAL_add_named_parameter(face_patch_t, face_patch, face_patch_map)
|
CGAL_add_named_parameter(face_patch_t, face_patch, face_patch_map)
|
||||||
CGAL_add_named_parameter(random_uniform_sampling_t, random_uniform_sampling, random_uniform_sampling)
|
CGAL_add_named_parameter(random_uniform_sampling_t, random_uniform_sampling, use_random_uniform_sampling)
|
||||||
CGAL_add_named_parameter(grid_sampling_t, grid_sampling, grid_sampling)
|
CGAL_add_named_parameter(grid_sampling_t, grid_sampling, use_grid_sampling)
|
||||||
CGAL_add_named_parameter(monte_carlo_sampling_t, monte_carlo_sampling, monte_carlo_sampling)
|
CGAL_add_named_parameter(monte_carlo_sampling_t, monte_carlo_sampling, use_monte_carlo_sampling)
|
||||||
CGAL_add_named_parameter(do_sample_edges_t, do_sample_edges, do_sample_edges)
|
CGAL_add_named_parameter(do_sample_edges_t, do_sample_edges, do_sample_edges)
|
||||||
CGAL_add_named_parameter(do_sample_vertices_t, do_sample_vertices, do_sample_vertices)
|
CGAL_add_named_parameter(do_sample_vertices_t, do_sample_vertices, do_sample_vertices)
|
||||||
CGAL_add_named_parameter(do_sample_faces_t, do_sample_faces, do_sample_faces)
|
CGAL_add_named_parameter(do_sample_faces_t, do_sample_faces, do_sample_faces)
|
||||||
|
|
|
||||||
|
|
@ -2,10 +2,11 @@
|
||||||
#include <CGAL/assertions.h>
|
#include <CGAL/assertions.h>
|
||||||
#include <boost/type_traits/is_same.hpp>
|
#include <boost/type_traits/is_same.hpp>
|
||||||
|
|
||||||
|
#include <cstdlib>
|
||||||
|
|
||||||
template <int i>
|
template <int i>
|
||||||
struct A{
|
struct A
|
||||||
|
{
|
||||||
A(int v):v(v){}
|
A(int v):v(v){}
|
||||||
int v;
|
int v;
|
||||||
};
|
};
|
||||||
|
|
@ -21,50 +22,167 @@ void check_same_type(T)
|
||||||
template<class NamedParameters>
|
template<class NamedParameters>
|
||||||
void test(const NamedParameters& np)
|
void test(const NamedParameters& np)
|
||||||
{
|
{
|
||||||
// test values
|
using boost::get_param;
|
||||||
assert( get_param(np,CGAL::internal_np::vertex_index).v == 0 );
|
|
||||||
assert( get_param(np,CGAL::internal_np::halfedge_index).v == 1 );
|
// Test values
|
||||||
assert( get_param(np,CGAL::internal_np::face_index).v == 2 );
|
|
||||||
assert( get_param(np,CGAL::internal_np::vertex_point).v == 3 );
|
// Named parameters from Boost
|
||||||
assert( get_param(np,CGAL::internal_np::edge_index).v == 5 );
|
assert(get_param(np, boost::vertex_index).v == 0);
|
||||||
assert( get_param(np,boost::graph_visitor).v == 6 );
|
assert(get_param(np, boost::graph_visitor).v == 1);
|
||||||
assert( get_param(np,CGAL::internal_np::set_cache_policy).v == 7 );
|
|
||||||
assert( get_param(np,CGAL::internal_np::get_cost_policy).v == 8 );
|
// Named parameters that we use in CGAL
|
||||||
assert( get_param(np,CGAL::internal_np::get_cost_policy_params).v == 9 );
|
assert(get_param(np, CGAL::internal_np::vertex_point).v == 2);
|
||||||
assert( get_param(np,CGAL::internal_np::get_placement_policy).v == 10 );
|
assert(get_param(np, CGAL::internal_np::halfedge_index).v == 3);
|
||||||
assert( get_param(np,CGAL::internal_np::get_placement_policy_params).v == 11 );
|
assert(get_param(np, CGAL::internal_np::edge_index).v == 4);
|
||||||
assert( get_param(np,CGAL::internal_np::edge_is_constrained).v == 12 );
|
assert(get_param(np, CGAL::internal_np::face_index).v == 5);
|
||||||
|
|
||||||
|
assert(get_param(np, CGAL::internal_np::edge_is_constrained).v == 6);
|
||||||
|
assert(get_param(np, CGAL::internal_np::first_index).v == 7);
|
||||||
|
assert(get_param(np, CGAL::internal_np::number_of_iterations).v == 8);
|
||||||
|
|
||||||
|
// Named parameters that we use in the package 'Mesh_3'
|
||||||
|
assert(get_param(np, CGAL::internal_np::vertex_feature_degree).v == 9);
|
||||||
|
|
||||||
|
// Named parameters used in the package 'Polygon Mesh Processing'
|
||||||
|
assert(get_param(np, CGAL::internal_np::geom_traits).v == 10);
|
||||||
|
assert(get_param(np, CGAL::internal_np::vertex_incident_patches).v == 11);
|
||||||
|
assert(get_param(np, CGAL::internal_np::density_control_factor).v == 12);
|
||||||
|
assert(get_param(np, CGAL::internal_np::use_delaunay_triangulation).v == 13);
|
||||||
|
assert(get_param(np, CGAL::internal_np::fairing_continuity).v == 14);
|
||||||
|
assert(get_param(np, CGAL::internal_np::sparse_linear_solver).v == 15);
|
||||||
|
assert(get_param(np, CGAL::internal_np::number_of_relaxation_steps).v == 16);
|
||||||
|
assert(get_param(np, CGAL::internal_np::protect_constraints).v == 17);
|
||||||
|
assert(get_param(np, CGAL::internal_np::relax_constraints).v == 18);
|
||||||
|
assert(get_param(np, CGAL::internal_np::vertex_is_constrained).v == 19);
|
||||||
|
assert(get_param(np, CGAL::internal_np::face_patch).v == 20);
|
||||||
|
assert(get_param(np, CGAL::internal_np::random_uniform_sampling).v == 21);
|
||||||
|
assert(get_param(np, CGAL::internal_np::grid_sampling).v == 22);
|
||||||
|
assert(get_param(np, CGAL::internal_np::monte_carlo_sampling).v == 23);
|
||||||
|
assert(get_param(np, CGAL::internal_np::do_sample_edges).v == 24);
|
||||||
|
assert(get_param(np, CGAL::internal_np::do_sample_vertices).v == 25);
|
||||||
|
assert(get_param(np, CGAL::internal_np::do_sample_faces).v == 26);
|
||||||
|
assert(get_param(np, CGAL::internal_np::number_of_points_on_faces).v == 27);
|
||||||
|
assert(get_param(np, CGAL::internal_np::number_of_points_per_face).v == 28);
|
||||||
|
assert(get_param(np, CGAL::internal_np::grid_spacing).v == 29);
|
||||||
|
assert(get_param(np, CGAL::internal_np::number_of_points_per_edge).v == 30);
|
||||||
|
assert(get_param(np, CGAL::internal_np::number_of_points_on_edges).v == 31);
|
||||||
|
assert(get_param(np, CGAL::internal_np::nb_points_per_area_unit).v == 32);
|
||||||
|
assert(get_param(np, CGAL::internal_np::nb_points_per_distance_unit).v == 33);
|
||||||
|
|
||||||
|
// Named parameters that we use in the package 'Surface Mesh Simplification'
|
||||||
|
assert(get_param(np, CGAL::internal_np::get_cost_policy).v == 34);
|
||||||
|
assert(get_param(np, CGAL::internal_np::get_placement_policy).v == 35);
|
||||||
|
|
||||||
|
// To-be-documented named parameters
|
||||||
|
assert(get_param(np, CGAL::internal_np::face_normal).v == 36);
|
||||||
|
assert(get_param(np, CGAL::internal_np::random_seed).v == 37);
|
||||||
|
assert(get_param(np, CGAL::internal_np::do_project).v == 38);
|
||||||
|
|
||||||
|
// Internal named parameters
|
||||||
|
assert(get_param(np, CGAL::internal_np::weight_calculator).v == 39);
|
||||||
|
|
||||||
|
|
||||||
//test types
|
// Test types
|
||||||
|
|
||||||
|
// Named parameters from Boost
|
||||||
check_same_type<0>(get_param(np, boost::vertex_index));
|
check_same_type<0>(get_param(np, boost::vertex_index));
|
||||||
check_same_type<1>( get_param(np,CGAL::internal_np::halfedge_index) );
|
check_same_type<1>(get_param(np, boost::graph_visitor));
|
||||||
check_same_type<2>( get_param(np,CGAL::internal_np::face_index) );
|
|
||||||
check_same_type<3>( get_param(np,CGAL::internal_np::vertex_point) );
|
// Named parameters that we use in CGAL
|
||||||
check_same_type<5>( get_param(np,CGAL::internal_np::edge_index) );
|
check_same_type<2>(get_param(np, CGAL::internal_np::vertex_point));
|
||||||
check_same_type<6>( get_param(np,boost::graph_visitor) );
|
check_same_type<3>(get_param(np, CGAL::internal_np::halfedge_index));
|
||||||
check_same_type<7>( get_param(np,CGAL::internal_np::set_cache_policy) );
|
check_same_type<4>(get_param(np, CGAL::internal_np::edge_index));
|
||||||
check_same_type<8>( get_param(np,CGAL::internal_np::get_cost_policy) );
|
check_same_type<5>(get_param(np, CGAL::internal_np::face_index));
|
||||||
check_same_type<9>( get_param(np,CGAL::internal_np::get_cost_policy_params) );
|
|
||||||
check_same_type<10>( get_param(np,CGAL::internal_np::get_placement_policy) );
|
check_same_type<6>(get_param(np, CGAL::internal_np::edge_is_constrained));
|
||||||
check_same_type<11>( get_param(np,CGAL::internal_np::get_placement_policy_params) );
|
check_same_type<7>(get_param(np, CGAL::internal_np::first_index));
|
||||||
check_same_type<12>( get_param(np,CGAL::internal_np::edge_is_constrained) );
|
check_same_type<8>(get_param(np, CGAL::internal_np::number_of_iterations));
|
||||||
|
|
||||||
|
// Named parameters that we use in the package 'Mesh_3'
|
||||||
|
check_same_type<9>(get_param(np, CGAL::internal_np::vertex_feature_degree));
|
||||||
|
|
||||||
|
// Named parameters used in the package 'Polygon Mesh Processing'
|
||||||
|
check_same_type<10>(get_param(np, CGAL::internal_np::geom_traits));
|
||||||
|
check_same_type<11>(get_param(np, CGAL::internal_np::vertex_incident_patches));
|
||||||
|
check_same_type<12>(get_param(np, CGAL::internal_np::density_control_factor));
|
||||||
|
check_same_type<13>(get_param(np, CGAL::internal_np::use_delaunay_triangulation));
|
||||||
|
check_same_type<14>(get_param(np, CGAL::internal_np::fairing_continuity));
|
||||||
|
check_same_type<15>(get_param(np, CGAL::internal_np::sparse_linear_solver));
|
||||||
|
check_same_type<16>(get_param(np, CGAL::internal_np::number_of_relaxation_steps));
|
||||||
|
check_same_type<17>(get_param(np, CGAL::internal_np::protect_constraints));
|
||||||
|
check_same_type<18>(get_param(np, CGAL::internal_np::relax_constraints));
|
||||||
|
check_same_type<19>(get_param(np, CGAL::internal_np::vertex_is_constrained));
|
||||||
|
check_same_type<20>(get_param(np, CGAL::internal_np::face_patch));
|
||||||
|
check_same_type<21>(get_param(np, CGAL::internal_np::random_uniform_sampling));
|
||||||
|
check_same_type<22>(get_param(np, CGAL::internal_np::grid_sampling));
|
||||||
|
check_same_type<23>(get_param(np, CGAL::internal_np::monte_carlo_sampling));
|
||||||
|
check_same_type<24>(get_param(np, CGAL::internal_np::do_sample_edges));
|
||||||
|
check_same_type<25>(get_param(np, CGAL::internal_np::do_sample_vertices));
|
||||||
|
check_same_type<26>(get_param(np, CGAL::internal_np::do_sample_faces));
|
||||||
|
check_same_type<27>(get_param(np, CGAL::internal_np::number_of_points_on_faces));
|
||||||
|
check_same_type<28>(get_param(np, CGAL::internal_np::number_of_points_per_face));
|
||||||
|
check_same_type<29>(get_param(np, CGAL::internal_np::grid_spacing));
|
||||||
|
check_same_type<30>(get_param(np, CGAL::internal_np::number_of_points_per_edge));
|
||||||
|
check_same_type<31>(get_param(np, CGAL::internal_np::number_of_points_on_edges));
|
||||||
|
check_same_type<32>(get_param(np, CGAL::internal_np::nb_points_per_area_unit));
|
||||||
|
check_same_type<33>(get_param(np, CGAL::internal_np::nb_points_per_distance_unit));
|
||||||
|
|
||||||
|
// Named parameters that we use in the package 'Surface Mesh Simplification'
|
||||||
|
check_same_type<34>(get_param(np, CGAL::internal_np::get_cost_policy));
|
||||||
|
check_same_type<35>(get_param(np, CGAL::internal_np::get_placement_policy));
|
||||||
|
|
||||||
|
// To-be-documented named parameters
|
||||||
|
check_same_type<36>(get_param(np, CGAL::internal_np::face_normal));
|
||||||
|
check_same_type<37>(get_param(np, CGAL::internal_np::random_seed));
|
||||||
|
check_same_type<38>(get_param(np, CGAL::internal_np::do_project));
|
||||||
|
|
||||||
|
// Internal named parameters
|
||||||
|
check_same_type<39>(get_param(np, CGAL::internal_np::weight_calculator));
|
||||||
}
|
}
|
||||||
|
|
||||||
int main()
|
int main()
|
||||||
{
|
{
|
||||||
test(
|
test(CGAL::parameters::vertex_index_map(A<0>(0))
|
||||||
CGAL::parameters::vertex_index_map(A<0>(0)).
|
.visitor(A<1>(1))
|
||||||
halfedge_index_map(A<1>(1)).
|
.vertex_point_map(A<2>(2))
|
||||||
face_index_map(A<2>(2)).
|
.halfedge_index_map(A<3>(3))
|
||||||
vertex_point_map(A<3>(3)).
|
.edge_index_map(A<4>(4))
|
||||||
edge_index_map(A<5>(5)).
|
.face_index_map(A<5>(5))
|
||||||
visitor(A<6>(6)).
|
.edge_is_constrained_map(A<6>(6))
|
||||||
set_cache(A<7>(7)).
|
.first_index(A<7>(7))
|
||||||
get_cost(A<8>(8)).
|
.number_of_iterations(A<8>(8))
|
||||||
get_cost_params(A<9>(9)).
|
.vertex_feature_degree_map(A<9>(9))
|
||||||
get_placement(A<10>(10)).
|
.geom_traits(A<10>(10))
|
||||||
get_placement_params(A<11>(11)).
|
.vertex_incident_patches_map(A<11>(11))
|
||||||
edge_is_constrained_map(A<12>(12))
|
.density_control_factor(A<12>(12))
|
||||||
|
.use_delaunay_triangulation(A<13>(13))
|
||||||
|
.fairing_continuity(A<14>(14))
|
||||||
|
.sparse_linear_solver(A<15>(15))
|
||||||
|
.number_of_relaxation_steps(A<16>(16))
|
||||||
|
.protect_constraints(A<17>(17))
|
||||||
|
.relax_constraints(A<18>(18))
|
||||||
|
.vertex_is_constrained_map(A<19>(19))
|
||||||
|
.face_patch_map(A<20>(20))
|
||||||
|
.use_random_uniform_sampling(A<21>(21))
|
||||||
|
.use_grid_sampling(A<22>(22))
|
||||||
|
.use_monte_carlo_sampling(A<23>(23))
|
||||||
|
.do_sample_edges(A<24>(24))
|
||||||
|
.do_sample_vertices(A<25>(25))
|
||||||
|
.do_sample_faces(A<26>(26))
|
||||||
|
.number_of_points_on_faces(A<27>(27))
|
||||||
|
.number_of_points_per_face(A<28>(28))
|
||||||
|
.grid_spacing(A<29>(29))
|
||||||
|
.number_of_points_per_edge(A<30>(30))
|
||||||
|
.number_of_points_on_edges(A<31>(31))
|
||||||
|
.number_of_points_per_area_unit(A<32>(32))
|
||||||
|
.number_of_points_per_distance_unit(A<33>(33))
|
||||||
|
.get_cost(A<34>(34))
|
||||||
|
.get_placement(A<35>(35))
|
||||||
|
.face_normal_map(A<36>(36))
|
||||||
|
.random_seed(A<37>(37))
|
||||||
|
.do_project(A<38>(38))
|
||||||
|
.weight_calculator(A<39>(39))
|
||||||
);
|
);
|
||||||
|
|
||||||
|
return EXIT_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -86,7 +86,6 @@ endif()
|
||||||
create_single_source_cgal_program("self_intersection_surface_mesh_test.cpp" )
|
create_single_source_cgal_program("self_intersection_surface_mesh_test.cpp" )
|
||||||
create_single_source_cgal_program("test_is_polygon_soup_a_polygon_mesh.cpp")
|
create_single_source_cgal_program("test_is_polygon_soup_a_polygon_mesh.cpp")
|
||||||
create_single_source_cgal_program("test_stitching.cpp")
|
create_single_source_cgal_program("test_stitching.cpp")
|
||||||
create_single_source_cgal_program("test_pmp_bgl_named_params.cpp")
|
|
||||||
create_single_source_cgal_program("remeshing_test.cpp" )
|
create_single_source_cgal_program("remeshing_test.cpp" )
|
||||||
create_single_source_cgal_program("measures_test.cpp")
|
create_single_source_cgal_program("measures_test.cpp")
|
||||||
create_single_source_cgal_program("triangulate_faces_test.cpp")
|
create_single_source_cgal_program("triangulate_faces_test.cpp")
|
||||||
|
|
|
||||||
|
|
@ -1,62 +0,0 @@
|
||||||
#include <CGAL/Polygon_mesh_processing/internal/named_function_params.h>
|
|
||||||
#include <CGAL/assertions.h>
|
|
||||||
#include <boost/type_traits/is_same.hpp>
|
|
||||||
|
|
||||||
template <int i>
|
|
||||||
struct A{
|
|
||||||
A(int v):v(v){}
|
|
||||||
int v;
|
|
||||||
};
|
|
||||||
|
|
||||||
template <int i, class T>
|
|
||||||
void check_same_type(T)
|
|
||||||
{
|
|
||||||
static const bool b = boost::is_same< A<i>, T >::value;
|
|
||||||
CGAL_static_assertion(b);
|
|
||||||
assert(b);
|
|
||||||
}
|
|
||||||
|
|
||||||
template<class NamedParameters>
|
|
||||||
void test_np(const NamedParameters& np)
|
|
||||||
{
|
|
||||||
// test values
|
|
||||||
assert( get_param(np,CGAL::internal_np::vertex_index).v == 0 );
|
|
||||||
assert( get_param(np,CGAL::internal_np::face_index).v == 2 );
|
|
||||||
assert( get_param(np,CGAL::internal_np::vertex_point).v == 3 );
|
|
||||||
assert( get_param(np,CGAL::internal_np::edge_is_constrained).v == 12 );
|
|
||||||
assert( get_param(np,CGAL::internal_np::density_control_factor).v == 14 );
|
|
||||||
assert( get_param(np,CGAL::internal_np::use_delaunay_triangulation).v == 15 );
|
|
||||||
assert( get_param(np,CGAL::internal_np::fairing_continuity).v == 16 );
|
|
||||||
assert( get_param(np,CGAL::internal_np::sparse_linear_solver).v == 17 );
|
|
||||||
assert( get_param(np,CGAL::internal_np::weight_calculator).v == 18 );
|
|
||||||
|
|
||||||
//test types
|
|
||||||
check_same_type<0>( get_param(np,CGAL::internal_np::vertex_index) );
|
|
||||||
check_same_type<2>( get_param(np,CGAL::internal_np::face_index) );
|
|
||||||
check_same_type<3>( get_param(np,CGAL::internal_np::vertex_point) );
|
|
||||||
check_same_type<12>( get_param(np,CGAL::internal_np::edge_is_constrained) );
|
|
||||||
//
|
|
||||||
check_same_type<14>( get_param(np,CGAL::internal_np::density_control_factor) );
|
|
||||||
check_same_type<15>( get_param(np,CGAL::internal_np::use_delaunay_triangulation) );
|
|
||||||
check_same_type<16>( get_param(np,CGAL::internal_np::fairing_continuity) );
|
|
||||||
check_same_type<17>( get_param(np,CGAL::internal_np::sparse_linear_solver) );
|
|
||||||
check_same_type<18>( get_param(np,CGAL::internal_np::weight_calculator) );
|
|
||||||
}
|
|
||||||
|
|
||||||
int main()
|
|
||||||
{
|
|
||||||
test_np(
|
|
||||||
// start with inherited named params
|
|
||||||
CGAL::Polygon_mesh_processing::parameters::
|
|
||||||
vertex_index_map(A<0>(0)).
|
|
||||||
face_index_map(A<2>(2)).
|
|
||||||
vertex_point_map(A<3>(3)).
|
|
||||||
edge_is_constrained_map(A<12>(12)).
|
|
||||||
// continue with PMP specific named params
|
|
||||||
density_control_factor(A<14>(14)).
|
|
||||||
use_delaunay_triangulation(A<15>(15)).
|
|
||||||
fairing_continuity(A<16>(16)).
|
|
||||||
sparse_linear_solver(A<17>(17)).
|
|
||||||
weight_calculator(A<18>(18))
|
|
||||||
);
|
|
||||||
}
|
|
||||||
Loading…
Reference in New Issue