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

change ProxyFitting operator to return a new proxy

This commit is contained in:
Lingjie Zhu 2017-07-14 10:32:50 +08:00
parent 4cd702d477
commit d3dd242d2f
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Surface_mesh_approximation/include/CGAL/internal/Surface_mesh_approximation/VSA.h
View File

@ -126,11 +126,12 @@ template<typename PlaneProxy,
typedef typename GeomTraits::Construct_sum_of_vectors_3 Construct_sum_of_vectors_3; typedef typename GeomTraits::Construct_sum_of_vectors_3 Construct_sum_of_vectors_3;
typedef typename GeomTraits::Compute_scalar_product_3 Compute_scalar_product_3; typedef typename GeomTraits::Compute_scalar_product_3 Compute_scalar_product_3;
// Fit and construct a proxy
template<typename FacetIterator> template<typename FacetIterator>
FT operator()(FacetIterator beg, FacetIterator end, PlaneProxy &px) { PlaneProxy operator()(FacetIterator beg, FacetIterator end) {
CGAL_assertion(beg != end); CGAL_assertion(beg != end);
// update proxy normal // fitting normal
FT area(0); FT area(0);
Vector norm = CGAL::NULL_VECTOR; Vector norm = CGAL::NULL_VECTOR;
for (FacetIterator fitr = beg; fitr != end; ++fitr) { for (FacetIterator fitr = beg; fitr != end; ++fitr) {
@ -140,25 +141,25 @@ template<typename PlaneProxy,
} }
norm = scale_functor(norm, FT(1.0 / CGAL::to_double(area))); norm = scale_functor(norm, FT(1.0 / CGAL::to_double(area)));
norm = scale_functor(norm, FT(1.0 / std::sqrt(CGAL::to_double(norm.squared_length())))); norm = scale_functor(norm, FT(1.0 / std::sqrt(CGAL::to_double(norm.squared_length()))));
// construct proxy
PlaneProxy px;
px.normal = norm; px.normal = norm;
// update seed // update seed
FT err_min = error_functor(*beg, px);
px.seed = *beg; px.seed = *beg;
FT sum(0); FT err_min = error_functor(*beg, px);
for (FacetIterator fitr = beg; fitr != end; ++fitr) { for (FacetIterator fitr = beg; fitr != end; ++fitr) {
FT err = error_functor(*fitr, px); FT err = error_functor(*fitr, px);
if (err < err_min) { if (err < err_min) {
err_min = err; err_min = err;
px.seed = *fitr; px.seed = *fitr;
} }
sum += err;
} }
return sum;
// more update? this is gonna be less and less generic // more update? this is gonna be less and less generic
// fit is specific to each kind of proxy // fit is specific to each kind of proxy
return px;
} }
const FacetNormalMap normal_pmap; const FacetNormalMap normal_pmap;
@ -677,10 +678,8 @@ private:
BOOST_FOREACH(face_descriptor f, faces(mesh)) BOOST_FOREACH(face_descriptor f, faces(mesh))
px_facets[seg_pmap[f]].push_back(f); px_facets[seg_pmap[f]].push_back(f);
// TODO: add update()/fitting() requirement to Proxy concept maybe better for (std::size_t i = 0; i < proxies.size(); ++i)
for (std::size_t i = 0; i < proxies.size(); ++i) { proxies[i] = proxy_fitting(px_facets[i].begin(), px_facets[i].end());
proxy_fitting(px_facets[i].begin(), px_facets[i].end(), proxies[i]);
}
} }
/** /**