Begin outlining a new potential solution for working with walker methods

CGAL · Jul 3, 2020 · ec7b4a8 · ec7b4a8
1 parent d6da421
commit ec7b4a8
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 0 deletions.
diff --git a/Octree/include/CGAL/Octree.h b/Octree/include/CGAL/Octree.h
@@ -290,6 +290,13 @@ namespace CGAL {
                                           Walker_iterator<const Node>());
       }
 
+      template<class Walker>
+      Node_range nodes() const {
+        Node_walker first = Walker::first;
+        Node_walker next = Walker::next;
+        return nodes(first(m_root), next);
+      }
+
       /// @}
 
       /// \name Operators

diff --git a/Octree/include/CGAL/Octree/Walker_criterion.h b/Octree/include/CGAL/Octree/Walker_criterion.h
@@ -3,6 +3,7 @@
 
 #include <iostream>
 #include "Node.h"
+#include "Walker_iterator.h"
 
 namespace CGAL {
 
@@ -64,6 +65,39 @@ namespace CGAL {
         return first;
       }
 
+      class _Preorder {
+
+      public:
+
+        template<class Value>
+        static const Node::Node<Value> *first(const Node::Node<Value> *root) {
+          return root;
+        }
+
+        template<class Value>
+        static const Node::Node<Value> *next(const Node::Node<Value> *n) {
+
+          if (n->is_leaf()) {
+
+            auto next = next_sibling(n);
+
+            if (nullptr == next) {
+
+              return next_sibling_up(n);
+            }
+
+            return next;
+
+          } else {
+
+            // Return the first child of this node
+            return &(*n)[0];
+          }
+
+        }
+      };
+
+
       struct Preorder {
 
         template<class Value>