Add number_of_points method to Node

CGAL · Jul 17, 2020 · 97af9a0 · 97af9a0
1 parent 21c6d6b
commit 97af9a0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/Octree/include/CGAL/Octree/Node.h b/Octree/include/CGAL/Octree/Node.h
@@ -235,7 +235,15 @@ class Node {
    * \return
    */
   bool is_empty() const {
-    return m_points.end() == m_points.begin();
+    return m_points.empty();
+  }
+
+  /*!
+   * \brief Count the points contained by this node
+   * \return
+   */
+  std::size_t number_of_points() const {
+    return std::distance(m_points.begin(), m_points.end());
   }
 
   /// @}

diff --git a/Octree/include/CGAL/Octree/Split_criterion.h b/Octree/include/CGAL/Octree/Split_criterion.h
@@ -22,7 +22,7 @@ struct Bucket_size {
 
   template<class Node>
   bool operator()(const Node &n) const {
-    return (n.num_points() > m_bucket_size);
+    return (n.number_of_points() > m_bucket_size);
   }
 };
 
@@ -53,7 +53,7 @@ struct Max_depth_or_bucket_size {
 
   template<class Node>
   bool operator()(const Node &n) const {
-    size_t num_points = std::distance(n.points().begin(), n.points().end());
+    size_t num_points = n.number_of_points();
     size_t depth = n.depth();
     return (num_points > m_bucket_size && depth < m_max_depth);
   }