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

More testsuite/polyhedron fixes

This commit is contained in:
GYuvanShankar 2022-09-07 17:57:34 +05:30
parent b9ff787e7b
commit 7b30693cd7
4 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Mesh_2/doc/Mesh_2/dependencies
View File

@ -5,4 +5,3 @@ Algebraic_foundations
Circulator Circulator
Stream_support Stream_support
Triangulation_2 Triangulation_2
BGL

12
Mesh_3/include/CGAL/Labeled_mesh_domain_3.h
View File

@ -597,12 +597,12 @@ where the labeled image is used with a precomputed 3D image of weights :
if (weights_.is_valid()) if (weights_.is_valid())
{ {
return Labeled_mesh_domain_3 return Labeled_mesh_domain_3
(create_weighted_labeled_image_wrapper (p::function(create_weighted_labeled_image_wrapper
(image_, (image_,
weights_, weights_,
image_values_to_subdomain_indices_, image_values_to_subdomain_indices_,
value_outside_), value_outside_)),
Mesh_3::internal::compute_bounding_box(image_), p::bounding_object(Mesh_3::internal::compute_bounding_box(image_)),
p::relative_error_bound = relative_error_bound_, p::relative_error_bound = relative_error_bound_,
p::p_rng = p_rng_, p::p_rng = p_rng_,
p::null_subdomain_index = p::null_subdomain_index =
@ -613,11 +613,11 @@ where the labeled image is used with a precomputed 3D image of weights :
else else
{ {
return Labeled_mesh_domain_3 return Labeled_mesh_domain_3
(create_labeled_image_wrapper (p::function(create_labeled_image_wrapper
(image_, (image_,
image_values_to_subdomain_indices_, image_values_to_subdomain_indices_,
value_outside_), value_outside_)),
Mesh_3::internal::compute_bounding_box(image_), p::bounding_object(Mesh_3::internal::compute_bounding_box(image_)),
p::relative_error_bound = relative_error_bound_, p::relative_error_bound = relative_error_bound_,
p::p_rng = p_rng_, p::p_rng = p_rng_,
p::null_subdomain_index = p::null_subdomain_index =

2
Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Mesh_function.h
View File

@ -232,7 +232,7 @@ initialize(const Mesh_criteria& criteria, Mesh_fnt::Domain_tag)
criteria, criteria,
p_.protect_features, p_.protect_features,
p::mesh_3_options(p::pointer_to_stop_atomic_boolean = &stop_, p::mesh_3_options(p::pointer_to_stop_atomic_boolean = &stop_,
p::nonlinear_growth_of_balls = true)); p::nonlinear_growth_of_balls = true).v);
} }
template < typename D_, typename Tag > template < typename D_, typename Tag >

2
Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Optimization_plugin_cgal_code.cpp
View File

@ -171,7 +171,7 @@ Optimizer_thread* cgal_code_optimization(Scene_c3t3_item& c3t3_item,
p_function->bbox().zmax()); p_function->bbox().zmax());
Function_mesh_domain* p_domain = Function_mesh_domain* p_domain =
new Function_mesh_domain(Function_wrapper(*p_function), dom_bbox, 1e-7, new Function_mesh_domain(CGAL::parameters::function = Function_wrapper(*p_function), CGAL::parameters::bounding_object = dom_bbox, CGAL::parameters::relative_error_bound = 1e-7,
CGAL::parameters::construct_surface_patch_index = CGAL::parameters::construct_surface_patch_index =
[](int i, int j) { return (i * 1000 + j); } ); [](int i, int j) { return (i * 1000 + j); } );