From f01cc40e62b6b0831cabe4a1fb677dfd36e7cd4a Mon Sep 17 00:00:00 2001 From: Simon Giraudot Date: Thu, 3 Nov 2016 15:12:39 +0100 Subject: [PATCH] Clean up private/public/SKIP_IN_MANUAL/useless typedefs --- .../Classification/Local_eigen_analysis.h | 47 +++++++++---------- .../CGAL/Classification/Planimetric_grid.h | 7 +-- 2 files changed, 26 insertions(+), 28 deletions(-) diff --git a/Classification/include/CGAL/Classification/Local_eigen_analysis.h b/Classification/include/CGAL/Classification/Local_eigen_analysis.h index f83b9b7eae2..ab4e85c4e28 100644 --- a/Classification/include/CGAL/Classification/Local_eigen_analysis.h +++ b/Classification/include/CGAL/Classification/Local_eigen_analysis.h @@ -30,12 +30,9 @@ template Eigenvalues; ///< Eigenvalues (sorted in ascending order) @@ -105,7 +102,28 @@ public: mean_range /= size; } - /// \cond SKIP_IN_MANUAL + /*! + \brief Returns the estimated normal vector of the indexed point. + */ + const Vector& normal_vector (std::size_t index) const { return m_smallest_eigenvectors[index]; } + + /*! + \brief Returns the estimated local tangent plane of the index point. + */ + Plane plane (std::size_t index) const { return Plane (m_centroids[index], m_smallest_eigenvectors[index]); } + + /*! + \brief Returns the normalized eigenvalues of the index point. + */ + const Eigenvalues& eigenvalue (std::size_t index) const { return m_eigenvalues[index]; } + + /*! + \brief Returns the sum of eigenvalues of the index point. + */ + const double& sum_eigenvalues (std::size_t index) const { return m_sum_eigenvalues[index]; } + +private: + void compute (const Point& query, std::vector& neighbor_points) { if (neighbor_points.size() == 0) @@ -155,27 +173,6 @@ public: m_largest_eigenvectors.push_back (Vector (evectors[6], evectors[7], evectors[8])); } - /// \endcond - - /*! - \brief Returns the estimated normal vector of the indexed point. - */ - const Vector& normal_vector (std::size_t index) const { return m_smallest_eigenvectors[index]; } - - /*! - \brief Returns the estimated local tangent plane of the index point. - */ - Plane plane (std::size_t index) const { return Plane (m_centroids[index], m_smallest_eigenvectors[index]); } - - /*! - \brief Returns the normalized eigenvalues of the index point. - */ - const Eigenvalues& eigenvalue (std::size_t index) const { return m_eigenvalues[index]; } - - /*! - \brief Returns the sum of eigenvalues of the index point. - */ - const double& sum_eigenvalues (std::size_t index) const { return m_sum_eigenvalues[index]; } }; diff --git a/Classification/include/CGAL/Classification/Planimetric_grid.h b/Classification/include/CGAL/Classification/Planimetric_grid.h index 5a18e73ad62..2a91d0577f1 100644 --- a/Classification/include/CGAL/Classification/Planimetric_grid.h +++ b/Classification/include/CGAL/Classification/Planimetric_grid.h @@ -23,10 +23,11 @@ namespace Classification { template class Planimetric_grid { - typedef typename Kernel::FT FT; +public: typedef typename Kernel::Point_3 Point_3; typedef typename Kernel::Iso_cuboid_3 Iso_cuboid_3; - + +private: typedef Image > Image_indices; typedef Image Image_bool; @@ -53,7 +54,7 @@ public: const RandomAccessIterator& end, PointMap point_map, const Iso_cuboid_3& bbox, - const FT grid_resolution) + const double grid_resolution) { std::size_t size = (std::size_t)(end - begin);