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

Use default diagonalization interface for VCM functions

This commit is contained in:
Simon Giraudot 2015-09-03 14:36:47 +02:00
parent 09f3659353
commit 26aab5fc5c
2 changed files with 19 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Point_set_processing_3/include/CGAL/vcm_estimate_edges.h
View File

@ -39,8 +39,11 @@ namespace CGAL {
/// which however would result in selecting more points on sharper regions. /// which however would result in selecting more points on sharper regions.
/// More details are provided in \cgalCite{cgal:mog-vbcfe-11}. /// More details are provided in \cgalCite{cgal:mog-vbcfe-11}.
/// ///
/// \tparam VCM_traits is a model of `DiagonalizeTraits`. If Eigen 3 (or greater) is available and `CGAL_EIGEN3_ENABLED` is defined /// \tparam VCM_traits is a model of `DiagonalizeTraits`. It can be
/// then an overload using `Eigen_diagonalize_traits` is provided and this template parameter can be omitted. /// omitted: if Eigen 3 (or greater) is available and
/// `CGAL_EIGEN3_ENABLED` is defined then an overload using
/// `Eigen_diagonalize_traits` is provided. Otherwise, the internal
/// implementation `Internal_diagonalize_traits` is used.
/// \sa CGAL::compute_vcm()` /// \sa CGAL::compute_vcm()`
/// ///
template <class FT, class VCM_traits> template <class FT, class VCM_traits>
@ -72,12 +75,7 @@ vcm_is_on_feature_edge (cpp11::array<FT,6> &cov,
double threshold) double threshold)
{ {
return vcm_is_on_feature_edge(cov, threshold, return vcm_is_on_feature_edge(cov, threshold,
#ifdef CGAL_EIGEN3_ENABLED CGAL::Default_diagonalize_traits<double, 3>());
CGAL::Eigen_diagonalize_traits<double, 3>()
#else
CGAL::Internal_diagonalize_traits<double, 3>()
#endif
);
} }

35
Point_set_processing_3/include/CGAL/vcm_estimate_normals.h
View File

@ -32,11 +32,7 @@
#include <CGAL/Orthogonal_k_neighbor_search.h> #include <CGAL/Orthogonal_k_neighbor_search.h>
#include <CGAL/Fuzzy_sphere.h> #include <CGAL/Fuzzy_sphere.h>
#ifdef CGAL_EIGEN3_ENABLED #include <CGAL/Default_diagonalize_traits.h>
#include <CGAL/Eigen_diagonalize_traits.h>
#else
#include <CGAL/Internal_diagonalize_traits.h>
#endif
#include <iterator> #include <iterator>
#include <vector> #include <vector>
@ -370,9 +366,11 @@ vcm_estimate_normals (ForwardIterator first, ///< iterator over the first input
/// @tparam ForwardIterator iterator over input points. /// @tparam ForwardIterator iterator over input points.
/// @tparam PointPMap is a model of `ReadablePropertyMap` with a value_type = `Kernel::Point_3`. /// @tparam PointPMap is a model of `ReadablePropertyMap` with a value_type = `Kernel::Point_3`.
/// @tparam NormalPMap is a model of `WritablePropertyMap` with a value_type = `Kernel::Vector_3`. /// @tparam NormalPMap is a model of `WritablePropertyMap` with a value_type = `Kernel::Vector_3`.
/// \tparam VCM_traits is a model of `DiagonalizeTraits`. If Eigen 3 (or greater) is available and `CGAL_EIGEN3_ENABLED` is defined /// \tparam VCM_traits is a model of `DiagonalizeTraits`. It can be
/// then an overload using `Eigen_diagonalize_traits` is provided and this template parameter can be omitted. /// omitted: if Eigen 3 (or greater) is available and
/// `CGAL_EIGEN3_ENABLED` is defined then an overload using
/// `Eigen_diagonalize_traits` is provided. Otherwise, the internal
/// implementation `Internal_diagonalize_traits` is used.
// This variant deduces the kernel from the point property map // This variant deduces the kernel from the point property map
// and uses a radius for the convolution. // and uses a radius for the convolution.
template < typename ForwardIterator, template < typename ForwardIterator,
@ -411,8 +409,11 @@ vcm_estimate_normals (ForwardIterator first, ///< iterator over the first input
/// @tparam ForwardIterator iterator over input points. /// @tparam ForwardIterator iterator over input points.
/// @tparam PointPMap is a model of `ReadablePropertyMap` with a value_type = `Kernel::Point_3`. /// @tparam PointPMap is a model of `ReadablePropertyMap` with a value_type = `Kernel::Point_3`.
/// @tparam NormalPMap is a model of `WritablePropertyMap` with a value_type = `Kernel::Vector_3`. /// @tparam NormalPMap is a model of `WritablePropertyMap` with a value_type = `Kernel::Vector_3`.
/// \tparam VCM_traits is a model of `DiagonalizeTraits`. If Eigen 3 (or greater) is available and `CGAL_EIGEN3_ENABLED` is defined /// \tparam VCM_traits is a model of `DiagonalizeTraits`. It can be
/// then an overload using `Eigen_diagonalize_traits` is provided and this template parameter can be omitted. /// omitted: if Eigen 3 (or greater) is available and
/// `CGAL_EIGEN3_ENABLED` is defined then an overload using
/// `Eigen_diagonalize_traits` is provided. Otherwise, the internal
/// implementation `Internal_diagonalize_traits` is used.
// This variant deduces the kernel from the point property map // This variant deduces the kernel from the point property map
// and uses a number of neighbors for the convolution. // and uses a number of neighbors for the convolution.
@ -455,12 +456,7 @@ vcm_estimate_normals (ForwardIterator first,
double convolution_radius) double convolution_radius)
{ {
vcm_estimate_normals(first, beyond, point_pmap, normal_pmap, offset_radius, convolution_radius, vcm_estimate_normals(first, beyond, point_pmap, normal_pmap, offset_radius, convolution_radius,
#ifdef CGAL_EIGEN3_ENABLED CGAL::Default_diagonalize_traits<double, 3>());
CGAL::Eigen_diagonalize_traits<double, 3>()
#else
CGAL::Internal_diagonalize_traits<double, 3>()
#endif
);
} }
template < typename ForwardIterator, template < typename ForwardIterator,
@ -476,12 +472,7 @@ vcm_estimate_normals (ForwardIterator first,
unsigned int nb_neighbors_convolve) unsigned int nb_neighbors_convolve)
{ {
vcm_estimate_normals(first, beyond, point_pmap, normal_pmap, offset_radius, nb_neighbors_convolve, vcm_estimate_normals(first, beyond, point_pmap, normal_pmap, offset_radius, nb_neighbors_convolve,
#ifdef CGAL_EIGEN3_ENABLED CGAL::Default_diagonalize_traits<double, 3>());
CGAL::Eigen_diagonalize_traits<double, 3>()
#else
CGAL::Internal_diagonalize_traits<double, 3>()
#endif
);
} }