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

Store has_points instead of always calling recursive method

This commit is contained in:
Simon Giraudot 2017-06-01 11:22:17 +02:00
parent 2d305de319
commit 484ceeb143
1 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -68,6 +68,9 @@ private:
Planimetric_grid* m_lower_scale; Planimetric_grid* m_lower_scale;
std::size_t m_current_scale; std::size_t m_current_scale;
std::size_t m_width;
std::size_t m_height;
std::vector<bool> m_has_points;
public: public:
@ -195,10 +198,10 @@ public:
float grid_resolution) float grid_resolution)
: m_resolution (grid_resolution), m_lower_scale(NULL), m_current_scale(0) : m_resolution (grid_resolution), m_lower_scale(NULL), m_current_scale(0)
{ {
std::size_t width = (std::size_t)((bbox.xmax() - bbox.xmin()) / grid_resolution) + 1; m_width = (std::size_t)((bbox.xmax() - bbox.xmin()) / grid_resolution) + 1;
std::size_t height = (std::size_t)((bbox.ymax() - bbox.ymin()) / grid_resolution) + 1; m_height = (std::size_t)((bbox.ymax() - bbox.ymin()) / grid_resolution) + 1;
m_grid = Image_indices (width, height); m_grid = Image_indices (m_width, m_height);
for (std::size_t i = 0; i < input.size(); ++ i) for (std::size_t i = 0; i < input.size(); ++ i)
{ {
@ -215,6 +218,20 @@ public:
: m_resolution (lower_scale->resolution() * 2), m_lower_scale (lower_scale) : m_resolution (lower_scale->resolution() * 2), m_lower_scale (lower_scale)
{ {
m_current_scale = lower_scale->m_current_scale + 1; m_current_scale = lower_scale->m_current_scale + 1;
m_width = (m_lower_scale->width() + 1) / 2;
m_height = (m_lower_scale->height() + 1) / 2;
m_has_points.reserve(m_width * m_height);
for (std::size_t x = 0; x < m_width; ++ x)
for (std::size_t y = 0; y < m_height; ++ y)
{
m_has_points[x * m_height + y]
= (m_lower_scale->has_points(x*2, y*2)
|| m_lower_scale->has_points(x*2, y*2 + 1)
|| m_lower_scale->has_points(x*2 + 1, y*2 + 1)
|| m_lower_scale->has_points(x*2 + 1, y*2));
}
// std::cerr << "Grid size = " << width() << " " << height() << std::endl; // std::cerr << "Grid size = " << width() << " " << height() << std::endl;
} }
/// \endcond /// \endcond
@ -233,20 +250,14 @@ public:
*/ */
std::size_t width() const std::size_t width() const
{ {
if (m_current_scale == 0) return m_width;
return m_grid.width();
else
return (m_lower_scale->width() + 1) / 2;
} }
/*! /*!
\brief Returns the number of cells along the Y-axis. \brief Returns the number of cells along the Y-axis.
*/ */
std::size_t height() const std::size_t height() const
{ {
if (m_current_scale == 0) return m_height;
return m_grid.height();
else
return (m_lower_scale->height() + 1) / 2;
} }
/// \cond SKIP_IN_MANUAL /// \cond SKIP_IN_MANUAL
@ -289,10 +300,7 @@ public:
return (!(m_grid(x,y).empty())); return (!(m_grid(x,y).empty()));
} }
else else
return (m_lower_scale->has_points(x*2, y*2) return m_has_points[x * m_height + y];
|| m_lower_scale->has_points(x*2, y*2 + 1)
|| m_lower_scale->has_points(x*2 + 1, y*2 + 1)
|| m_lower_scale->has_points(x*2 + 1, y*2));
} }
/*! /*!