Change stop criterion to accept node references

CGAL · Jun 20, 2020 · c263f74 · c263f74
1 parent 194b8fd
commit c263f74
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/Octree/include/CGAL/Octree.h b/Octree/include/CGAL/Octree.h
@@ -128,7 +128,7 @@ namespace CGAL {
       m_root.unsplit();
     }
 
-    void refine(std::function<bool(const Node *)> stop_criterion) {
+    void refine(std::function<bool(const Node &)> stop_criterion) {
 
       // create a side length map
       for (int i = 0; i <= (int) 10; i++)
@@ -147,7 +147,7 @@ namespace CGAL {
         int depth = current->depth();
 
         // Check if this node needs to be processed
-        if (!stop_criterion(current)) {
+        if (!stop_criterion(*current)) {
 
           // Split this node
           current->split();

diff --git a/Octree/include/CGAL/Octree/Stop_criterion.h b/Octree/include/CGAL/Octree/Stop_criterion.h
@@ -12,8 +12,8 @@ namespace CGAL {
             m_max_depth(max_depth), m_bucket_size(bucket_size) {}
 
     template<class Node>
-    bool operator()(Node n) const {
-      return (n->num_points() <= m_bucket_size || n->depth() == m_max_depth);
+    bool operator()(const Node &n) const {
+      return (n.num_points() <= m_bucket_size || n.depth() == m_max_depth);
     }
   };
 
@@ -24,8 +24,8 @@ namespace CGAL {
     Stop_at_max_depth(std::size_t max_depth) : m_max_depth(max_depth) {}
 
     template<class Node>
-    bool operator()(Node n) const {
-      return n->depth() == m_max_depth;
+    bool operator()(const Node &n) const {
+      return n.depth() == m_max_depth;
     }
   };