@@ -97,7 +97,6 @@ void test(const NamedParameters& np)
9797 assert (get_param (np, CGAL::internal_np::face_normal).v == 36 );
9898 assert (get_param (np, CGAL::internal_np::random_seed).v == 37 );
9999 assert (get_param (np, CGAL::internal_np::do_project).v == 38 );
100- assert (get_param (np, CGAL::internal_np::opengr_options).v == 9001 );
101100
102101 // Internal named parameters
103102 assert (get_param (np, CGAL::internal_np::weight_calculator).v == 39 );
@@ -179,7 +178,6 @@ void test(const NamedParameters& np)
179178 check_same_type<36 >(get_param (np, CGAL::internal_np::face_normal));
180179 check_same_type<37 >(get_param (np, CGAL::internal_np::random_seed));
181180 check_same_type<38 >(get_param (np, CGAL::internal_np::do_project));
182- check_same_type<9001 >(get_param (np, CGAL::internal_np::opengr_options));
183181
184182 // Internal named parameters
185183 check_same_type<39 >(get_param (np, CGAL::internal_np::weight_calculator));
@@ -189,6 +187,34 @@ void test(const NamedParameters& np)
189187 check_same_type<42 >(get_param (np, CGAL::internal_np::projection_functor));
190188 check_same_type<46 >(get_param (np, CGAL::internal_np::apply_per_connected_component));
191189 check_same_type<47 >(get_param (np, CGAL::internal_np::output_iterator));
190+
191+ // Named parameters used in the package 'Point Set Processing'
192+ check_same_type<9000 >(get_param (np, CGAL::internal_np::point_map));
193+ check_same_type<9001 >(get_param (np, CGAL::internal_np::query_point_map));
194+ check_same_type<9002 >(get_param (np, CGAL::internal_np::normal_map));
195+ check_same_type<9003 >(get_param (np, CGAL::internal_np::diagonalize_traits));
196+ check_same_type<9004 >(get_param (np, CGAL::internal_np::svd_traits));
197+ check_same_type<9005 >(get_param (np, CGAL::internal_np::callback));
198+ check_same_type<9006 >(get_param (np, CGAL::internal_np::sharpness_angle));
199+ check_same_type<9007 >(get_param (np, CGAL::internal_np::edge_sensitivity));
200+ check_same_type<9008 >(get_param (np, CGAL::internal_np::neighbor_radius));
201+ check_same_type<9009 >(get_param (np, CGAL::internal_np::number_of_output_points));
202+ check_same_type<9010 >(get_param (np, CGAL::internal_np::size));
203+ check_same_type<9011 >(get_param (np, CGAL::internal_np::maximum_variation));
204+ check_same_type<9012 >(get_param (np, CGAL::internal_np::degree_fitting));
205+ check_same_type<9013 >(get_param (np, CGAL::internal_np::degree_monge));
206+ check_same_type<9014 >(get_param (np, CGAL::internal_np::threshold_percent));
207+ check_same_type<9015 >(get_param (np, CGAL::internal_np::threshold_distance));
208+ check_same_type<9016 >(get_param (np, CGAL::internal_np::attraction_factor));
209+ check_same_type<9017 >(get_param (np, CGAL::internal_np::plane_map));
210+ check_same_type<9018 >(get_param (np, CGAL::internal_np::plane_index_map));
211+ check_same_type<9019 >(get_param (np, CGAL::internal_np::select_percentage));
212+ check_same_type<9020 >(get_param (np, CGAL::internal_np::require_uniform_sampling));
213+ check_same_type<9021 >(get_param (np, CGAL::internal_np::point_is_constrained));
214+ check_same_type<9022 >(get_param (np, CGAL::internal_np::number_of_samples));
215+ check_same_type<9023 >(get_param (np, CGAL::internal_np::accuracy));
216+ check_same_type<9024 >(get_param (np, CGAL::internal_np::maximum_running_time));
217+ check_same_type<9025 >(get_param (np, CGAL::internal_np::overlap));
192218}
193219
194220int main ()
@@ -242,7 +268,6 @@ int main()
242268 .face_normal_map (A<36 >(36 ))
243269 .random_seed (A<37 >(37 ))
244270 .do_project (A<38 >(38 ))
245- .opengr_options (A<>(9001 ))
246271 .weight_calculator (A<39 >(39 ))
247272 .preserve_genus (A<40 >(40 ))
248273 .verbosity_level (A<41 >(41 ))
@@ -257,6 +282,32 @@ int main()
257282 .erase_all_duplicates (A<48 >(48 ))
258283 .require_same_orientation (A<49 >(49 ))
259284 .face_size_map (A<52 >(52 ))
285+ .point_map (A<9000 >(9000 ))
286+ .query_point_map (A<9001 >(9001 ))
287+ .normal_map (A<9002 >(9002 ))
288+ .diagonalize_traits (A<9003 >(9003 ))
289+ .svd_traits (A<9004 >(9004 ))
290+ .callback (A<9005 >(9005 ))
291+ .sharpness_angle (A<9006 >(9006 ))
292+ .edge_sensitivity (A<9007 >(9007 ))
293+ .neighbor_radius (A<9008 >(9008 ))
294+ .number_of_output_points (A<9009 >(9009 ))
295+ .size (A<9010 >(9010 ))
296+ .maximum_variation (A<9011 >(9011 ))
297+ .degree_fitting (A<9012 >(9012 ))
298+ .degree_monge (A<9013 >(9013 ))
299+ .threshold_percent (A<9014 >(9014 ))
300+ .threshold_distance (A<9015 >(9015 ))
301+ .attraction_factor (A<9016 >(9016 ))
302+ .plane_map (A<9017 >(9017 ))
303+ .plane_index_map (A<9018 >(9018 ))
304+ .select_percentage (A<9019 >(9019 ))
305+ .require_uniform_sampling (A<9020 >(9020 ))
306+ .point_is_constrained_map (A<9021 >(9021 ))
307+ .number_of_samples (A<9022 >(9022 ))
308+ .accuracy (A<9023 >(9023 ))
309+ .maximum_running_time (A<9024 >(9024 ))
310+ .overlap (A<9025 >(9025 ))
260311 );
261312
262313 return EXIT_SUCCESS;
0 commit comments