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

Clean up private/public/SKIP_IN_MANUAL/useless typedefs

This commit is contained in:
Simon Giraudot 2016-11-03 15:12:39 +01:00
parent 3d667a7d26
commit f01cc40e62
2 changed files with 26 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
Classification/include/CGAL/Classification/Local_eigen_analysis.h
View File

@ -30,12 +30,9 @@ template <typename Kernel, typename RandomAccessIterator, typename PointMap,
class Local_eigen_analysis
{
public:
/// \cond SKIP_IN_MANUAL
typedef typename Kernel::FT FT;
typedef typename Kernel::Point_3 Point;
typedef typename Kernel::Vector_3 Vector;
typedef typename Kernel::Plane_3 Plane;
/// \endcond
typedef CGAL::cpp11::array<double, 3> 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<Point>& 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]; }
};

7
Classification/include/CGAL/Classification/Planimetric_grid.h
View File

@ -23,10 +23,11 @@ namespace Classification {
template <typename Kernel, typename RandomAccessIterator, typename PointMap>
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<std::vector<std::size_t> > Image_indices;
typedef Image<bool> 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);