Orthtree generalization

Orthtree/include/CGAL/Orthtree.h

@@ -225,7 +225,7 @@ class Orthtree {
 
 
     // init bbox with first values found
-    auto [bbox_min, bbox_max] = m_traits.root_node_bbox();
+    auto [bbox_min, bbox_max] = m_traits.root_node_bbox_object()();
 
     // Dilate the bounding box
     Array bbox_centroid;
@@ -246,7 +246,7 @@ class Orthtree {
     // save orthtree attributes
     m_bbox_min = construct_point_d_from_array(bbox_min);
     m_side_per_depth.push_back(bbox_max[0] - bbox_min[0]);
-    data(root()) = m_traits.root_node_contents();
+    data(root()) = m_traits.root_node_contents_object()();
   }
 
   /// @}
@@ -830,7 +830,7 @@ class Orthtree {
     Point center = barycenter(n);
 
     // Add the node's points to its children
-    m_traits.distribute_node_contents(n, *this, center);
+    m_traits.distribute_node_contents_object()(n, *this, center);
   }
 
   /*!
@@ -1031,7 +1031,7 @@ class Orthtree {
 
         // Pair that point with its distance from the search point
         Node_element_with_distance current_point_with_distance =
-          {p, squared_distance(m_traits.get_element(p), search_bounds.center())};
+          {p, squared_distance(m_traits.get_element_object()(p), search_bounds.center())};
 
         // Check if the new point is within the bounds
         if (current_point_with_distance.distance < search_bounds.squared_radius()) {

Orthtree/include/CGAL/Orthtree_traits_3_base.h

@@ -45,7 +45,7 @@ struct Orthtree_traits_3_base {
   using Bbox_d = Bbox_3;
   using FT = typename K::FT;
   using Point_d = typename K::Point_3;
-  using Sphere_d = typename K::Circle_3;
+  using Sphere_d = typename K::Sphere_3;
   using Cartesian_const_iterator_d = typename K::Cartesian_const_iterator_3;
   using Array = std::array<FT, Dimension::value>; // todo: This should have a more descriptive name
 

Orthtree/include/CGAL/Orthtree_traits_point_2.h

@@ -51,6 +51,7 @@ struct Orthtree_traits_point_2 : public Orthtree_traits_2_base<GeomTraits> {
   /// @{
 
   using Self = Orthtree_traits_point_2<GeomTraits, PointSet, PointMap>;
+  using Tree = Orthtree<Self>;
 
   // todo: looking for better names
   using Node_data = boost::iterator_range<typename PointSet::iterator>;
@@ -108,46 +109,55 @@ struct Orthtree_traits_point_2 : public Orthtree_traits_2_base<GeomTraits> {
   */
   Construct_bbox_d construct_bbox_d_object() const { return Construct_bbox_d(); }
 
-  std::pair<typename Self::Array, typename Self::Array> root_node_bbox() const {
-
-    typename Self::Array bbox_min;
-    typename Self::Array bbox_max;
-    Orthtrees::internal::Cartesian_ranges<Self> cartesian_range;
-
-    // init bbox with first values found
-    {
-      const typename Self::Point_d& point = get(m_point_map, *(m_point_set.begin()));
-      std::size_t i = 0;
-      for (const typename Self::FT& x: cartesian_range(point)) {
-        bbox_min[i] = x;
-        bbox_max[i] = x;
-        ++i;
+  auto root_node_bbox_object() const {
+    return [&]() -> std::pair<typename Self::Array, typename Self::Array> {
+
+      typename Self::Array bbox_min;
+      typename Self::Array bbox_max;
+      Orthtrees::internal::Cartesian_ranges<Self> cartesian_range;
+
+      // init bbox with first values found
+      {
+        const typename Self::Point_d& point = get(m_point_map, *(m_point_set.begin()));
+        std::size_t i = 0;
+        for (const typename Self::FT& x: cartesian_range(point)) {
+          bbox_min[i] = x;
+          bbox_max[i] = x;
+          ++i;
+        }
       }
-    }
-    // Expand bbox to contain all points
-    for (const auto& p: m_point_set) {
-      const typename Self::Point_d& point = get(m_point_map, p);
-      std::size_t i = 0;
-      for (const typename Self::FT& x: cartesian_range(point)) {
-        bbox_min[i] = (std::min)(x, bbox_min[i]);
-        bbox_max[i] = (std::max)(x, bbox_max[i]);
-        ++i;
+      // Expand bbox to contain all points
+      for (const auto& p: m_point_set) {
+        const typename Self::Point_d& point = get(m_point_map, p);
+        std::size_t i = 0;
+        for (const typename Self::FT& x: cartesian_range(point)) {
+          bbox_min[i] = (std::min)(x, bbox_min[i]);
+          bbox_max[i] = (std::max)(x, bbox_max[i]);
+          ++i;
+        }
       }
-    }
 
-    return {bbox_min, bbox_max};
+      return {bbox_min, bbox_max};
+    };
   }
 
-  Node_data root_node_contents() const { return {m_point_set.begin(), m_point_set.end()}; }
+  auto root_node_contents_object() const {
+    return [&]() -> typename Self::Node_data {
+      return {m_point_set.begin(), m_point_set.end()};
+    };
+  }
 
-  template <typename Node_index, typename Tree>
-  void distribute_node_contents(Node_index n, Tree& tree, const typename Self::Point_d& center) {
-    CGAL_precondition(!tree.is_leaf(n));
-    reassign_points(tree, m_point_map, n, center, tree.data(n));
+  auto distribute_node_contents_object() const {
+    return [&](typename Tree::Node_index n, Tree& tree, const typename Self::Point_d& center) {
+      CGAL_precondition(!tree.is_leaf(n));
+      reassign_points(tree, m_point_map, n, center, tree.data(n));
+    };
   }
 
-  typename Self::Point_d get_element(const Node_data_element& index) const {
-    return get(m_point_map, index);
+  auto get_element_object() const {
+    return [&](const Node_data_element& index) -> typename Self::Point_d {
+      return get(m_point_map, index);
+    };
   }
 
   /// @}

Orthtree/include/CGAL/Orthtree_traits_point_3.h

@@ -51,6 +51,7 @@ struct Orthtree_traits_point_3 : public Orthtree_traits_3_base<GeomTraits> {
   /// @{
 
   using Self = Orthtree_traits_point_3<GeomTraits, PointSet, PointMap>;
+  using Tree = Orthtree<Self>;
 
   // todo: looking for better names
   using Node_data = boost::iterator_range<typename PointSet::iterator>;
@@ -80,8 +81,8 @@ struct Orthtree_traits_point_3 : public Orthtree_traits_3_base<GeomTraits> {
 
   struct Construct_bbox_d {
     typename Self::Bbox_d operator()(const typename Self::Array& min,
-                      const typename Self::Array& max) const {
-      return Bbox_d(min[0], min[1], min[2], max[0], max[1], max[2]);
+                                     const typename Self::Array& max) const {
+      return typename Self::Bbox_d(min[0], min[1], min[2], max[0], max[1], max[2]);
     }
   };
 
@@ -107,46 +108,55 @@ struct Orthtree_traits_point_3 : public Orthtree_traits_3_base<GeomTraits> {
   */
   Construct_bbox_d construct_bbox_d_object() const { return Construct_bbox_d(); }
 
-  std::pair<typename Self::Array, typename Self::Array> root_node_bbox() const {
-
-    typename Self::Array bbox_min;
-    typename Self::Array bbox_max;
-    Orthtrees::internal::Cartesian_ranges<Self> cartesian_range;
-
-    // init bbox with first values found
-    {
-      const typename Self::Point_d& point = get(m_point_map, *(m_point_set.begin()));
-      std::size_t i = 0;
-      for (const typename Self::FT& x: cartesian_range(point)) {
-        bbox_min[i] = x;
-        bbox_max[i] = x;
-        ++i;
+  auto root_node_bbox_object() const {
+    return [&]() -> std::pair<typename Self::Array, typename Self::Array> {
+
+      typename Self::Array bbox_min;
+      typename Self::Array bbox_max;
+      Orthtrees::internal::Cartesian_ranges<Self> cartesian_range;
+
+      // init bbox with first values found
+      {
+        const typename Self::Point_d& point = get(m_point_map, *(m_point_set.begin()));
+        std::size_t i = 0;
+        for (const typename Self::FT& x: cartesian_range(point)) {
+          bbox_min[i] = x;
+          bbox_max[i] = x;
+          ++i;
+        }
       }
-    }
-    // Expand bbox to contain all points
-    for (const auto& p: m_point_set) {
-      const typename Self::Point_d& point = get(m_point_map, p);
-      std::size_t i = 0;
-      for (const typename Self::FT& x: cartesian_range(point)) {
-        bbox_min[i] = (std::min)(x, bbox_min[i]);
-        bbox_max[i] = (std::max)(x, bbox_max[i]);
-        ++i;
+      // Expand bbox to contain all points
+      for (const auto& p: m_point_set) {
+        const typename Self::Point_d& point = get(m_point_map, p);
+        std::size_t i = 0;
+        for (const typename Self::FT& x: cartesian_range(point)) {
+          bbox_min[i] = (std::min)(x, bbox_min[i]);
+          bbox_max[i] = (std::max)(x, bbox_max[i]);
+          ++i;
+        }
       }
-    }
 
-    return {bbox_min, bbox_max};
+      return {bbox_min, bbox_max};
+    };
   }
 
-  typename Self::Node_data root_node_contents() const { return {m_point_set.begin(), m_point_set.end()}; }
+  auto root_node_contents_object() const {
+    return [&]() -> typename Self::Node_data {
+      return {m_point_set.begin(), m_point_set.end()};
+    };
+  }
 
-  template <typename Node_index, typename Tree>
-  void distribute_node_contents(Node_index n, Tree& tree, const typename Self::Point_d& center) {
-    CGAL_precondition(!tree.is_leaf(n));
-    reassign_points(tree, m_point_map, n, center, tree.data(n));
+  auto distribute_node_contents_object() const {
+    return [&](typename Tree::Node_index n, Tree& tree, const typename Self::Point_d& center) {
+      CGAL_precondition(!tree.is_leaf(n));
+      reassign_points(tree, m_point_map, n, center, tree.data(n));
+    };
   }
 
-  typename Self::Point_d get_element(const Node_data_element& index) const {
-    return get(m_point_map, index);
+  auto get_element_object() const {
+    return [&](const Node_data_element& index) -> typename Self::Point_d {
+      return get(m_point_map, index);
+    };
   }
 
   /// @}

Orthtree/include/CGAL/Orthtree_traits_point_d.h

@@ -88,6 +88,7 @@ struct Orthtree_traits_point_d : public Orthtree_traits_d_base<GeomTraits, Dimen
   /// @{
 
   using Self = Orthtree_traits_point_d<GeomTraits, DimensionTag, PointSet, PointMap>;
+  using Tree = Orthtree<Self>;
 
   using Node_data = boost::iterator_range<typename PointSet::iterator>;
   using Node_data_element = typename std::iterator_traits<typename PointSet::iterator>::value_type;
@@ -116,7 +117,8 @@ struct Orthtree_traits_point_d : public Orthtree_traits_d_base<GeomTraits, Dimen
 
   struct Construct_bbox_d {
     typename Self::Bbox_d operator()(const typename Self::Array& min, const typename Self::Array& max) const {
-      return typename Self::Bbox_d(typename Self::Point_d(min.begin(), min.end()), typename Self::Point_d(max.begin(), max.end()));
+      return typename Self::Bbox_d(typename Self::Point_d(min.begin(), min.end()),
+                                   typename Self::Point_d(max.begin(), max.end()));
     }
   };
 
@@ -142,46 +144,55 @@ struct Orthtree_traits_point_d : public Orthtree_traits_d_base<GeomTraits, Dimen
   */
   Construct_bbox_d construct_bbox_d_object() const { return Construct_bbox_d(); }
 
-  std::pair<typename Self::Array, typename Self::Array> root_node_bbox() const {
-
-    typename Self::Array bbox_min;
-    typename Self::Array bbox_max;
-    Orthtrees::internal::Cartesian_ranges<Self> cartesian_range;
-
-    // init bbox with first values found
-    {
-      const auto& point = get(m_point_map, *(m_point_set.begin()));
-      std::size_t i = 0;
-      for (const typename Self::FT& x: cartesian_range(point)) {
-        bbox_min[i] = x;
-        bbox_max[i] = x;
-        ++i;
+  auto root_node_bbox_object() const {
+    return [&]() -> std::pair<typename Self::Array, typename Self::Array> {
+
+      typename Self::Array bbox_min;
+      typename Self::Array bbox_max;
+      Orthtrees::internal::Cartesian_ranges<Self> cartesian_range;
+
+      // init bbox with first values found
+      {
+        const typename Self::Point_d& point = get(m_point_map, *(m_point_set.begin()));
+        std::size_t i = 0;
+        for (const typename Self::FT& x: cartesian_range(point)) {
+          bbox_min[i] = x;
+          bbox_max[i] = x;
+          ++i;
+        }
       }
-    }
-    // Expand bbox to contain all points
-    for (const auto& p: m_point_set) {
-      const auto& point = get(m_point_map, p);
-      std::size_t i = 0;
-      for (const typename Self::FT& x: cartesian_range(point)) {
-        bbox_min[i] = (std::min)(x, bbox_min[i]);
-        bbox_max[i] = (std::max)(x, bbox_max[i]);
-        ++i;
+      // Expand bbox to contain all points
+      for (const auto& p: m_point_set) {
+        const typename Self::Point_d& point = get(m_point_map, p);
+        std::size_t i = 0;
+        for (const typename Self::FT& x: cartesian_range(point)) {
+          bbox_min[i] = (std::min)(x, bbox_min[i]);
+          bbox_max[i] = (std::max)(x, bbox_max[i]);
+          ++i;
+        }
       }
-    }
 
-    return {bbox_min, bbox_max};
+      return {bbox_min, bbox_max};
+    };
   }
 
-  Node_data root_node_contents() const { return {m_point_set.begin(), m_point_set.end()}; }
+  auto root_node_contents_object() const {
+    return [&]() -> typename Self::Node_data {
+      return {m_point_set.begin(), m_point_set.end()};
+    };
+  }
 
-  template <typename Node_index, typename Tree>
-  void distribute_node_contents(Node_index n, Tree& tree, const typename Self::Point_d& center) {
-    CGAL_precondition(!tree.is_leaf(n));
-    reassign_points(tree, m_point_map, n, center, tree.data(n));
+  auto distribute_node_contents_object() const {
+    return [&](typename Tree::Node_index n, Tree& tree, const typename Self::Point_d& center) {
+      CGAL_precondition(!tree.is_leaf(n));
+      reassign_points(tree, m_point_map, n, center, tree.data(n));
+    };
   }
 
-  typename Self::Point_d get_element(const Node_data_element& index) const {
-    return get(m_point_map, index);
+  auto get_element_object() const {
+    return [&](const Node_data_element& index) -> typename Self::Point_d {
+      return get(m_point_map, index);
+    };
   }
 
   /// @}