diff --git a/Surface_mesh_simplification/benchmark/Surface_mesh_simplification/bench_garland_heckbert.cpp b/Surface_mesh_simplification/benchmark/Surface_mesh_simplification/bench_garland_heckbert.cpp index c2ac7ec92cd..89f840b63ac 100644 --- a/Surface_mesh_simplification/benchmark/Surface_mesh_simplification/bench_garland_heckbert.cpp +++ b/Surface_mesh_simplification/benchmark/Surface_mesh_simplification/bench_garland_heckbert.cpp @@ -2,7 +2,7 @@ #include #include -#include +#include #include #include @@ -70,14 +70,13 @@ double collapse_gh(Surface_mesh& mesh, typedef typename GHPolicies::Get_cost GH_cost; typedef typename GHPolicies::Get_placement GH_placement; - typedef SMS::Bounded_normal_change_placement Bounded_GH_placement; + typedef SMS::Bounded_normal_change_filter<> Filter; // GHPolicies gh_policies(mesh); const GH_cost& gh_cost = gh_policies.get_cost(); const GH_placement& gh_placement = gh_policies.get_placement(); - Bounded_GH_placement placement(gh_placement); - SMS::edge_collapse(mesh, stop, CGAL::parameters::get_cost(gh_cost).get_placement(placement)); + SMS::edge_collapse(mesh, stop, CGAL::parameters::get_cost(gh_cost).filter(Filter()).get_placement(gh_placement)); std::chrono::steady_clock::time_point end_time = std::chrono::steady_clock::now(); diff --git a/Surface_mesh_simplification/examples/Surface_mesh_simplification/edge_collapse_garland_heckbert.cpp b/Surface_mesh_simplification/examples/Surface_mesh_simplification/edge_collapse_garland_heckbert.cpp index 7a077e23441..3e0b632d0f8 100644 --- a/Surface_mesh_simplification/examples/Surface_mesh_simplification/edge_collapse_garland_heckbert.cpp +++ b/Surface_mesh_simplification/examples/Surface_mesh_simplification/edge_collapse_garland_heckbert.cpp @@ -2,7 +2,7 @@ #include #include -#include +#include #include #include @@ -38,16 +38,17 @@ void collapse_gh(Surface_mesh& mesh, typedef typename GHPolicies::Get_cost GH_cost; typedef typename GHPolicies::Get_placement GH_placement; - typedef SMS::Bounded_normal_change_placement Bounded_GH_placement; + typedef SMS::Bounded_normal_change_filter<> Filter; GHPolicies gh_policies(mesh); const GH_cost& gh_cost = gh_policies.get_cost(); const GH_placement& gh_placement = gh_policies.get_placement(); - Bounded_GH_placement placement(gh_placement); + Filter filter; int r = SMS::edge_collapse(mesh, stop, CGAL::parameters::get_cost(gh_cost) - .get_placement(placement)); + .filter(filter) + .get_placement(gh_placement)); std::chrono::steady_clock::time_point end_time = std::chrono::steady_clock::now();