Overhaul

src/cluster/detail/ArborX_BoruvkaHelpers.hpp

@@ -12,7 +12,7 @@
 #ifndef ARBORX_BORUVKA_HELPERS_HPP
 #define ARBORX_BORUVKA_HELPERS_HPP
 
-#include <detail/ArborX_GeometryAlgorithms.hpp>
+#include <algorithms/ArborX_Distance.hpp>
 #include <detail/ArborX_HappyTreeFriends.hpp>
 #include <detail/ArborX_WeightedEdge.hpp>
 #include <kokkos_ext/ArborX_KokkosExtArithmeticTraits.hpp>

src/cluster/detail/ArborX_MutualReachabilityDistance.hpp

@@ -13,7 +13,6 @@
 #define ARBORX_MUTUAL_REACHABILITY_DISTANCE_HPP
 
 #include <detail/ArborX_AccessTraits.hpp>
-#include <detail/ArborX_GeometryAlgorithms.hpp>
 #include <detail/ArborX_HappyTreeFriends.hpp>
 #include <detail/ArborX_Predicates.hpp>
 

src/distributed/detail/ArborX_DistributedTreeNearestHelpers.hpp

@@ -13,6 +13,7 @@
 
 #include <ArborX_Point.hpp>
 #include <ArborX_Sphere.hpp>
+#include <algorithms/ArborX_Convert.hpp>
 #include <detail/ArborX_AccessTraits.hpp>
 #include <detail/ArborX_Callbacks.hpp>
 

src/geometry/ArborX_KDOP.hpp

@@ -15,7 +15,6 @@
 #include <ArborX_Box.hpp>
 #include <ArborX_GeometryTraits.hpp>
 #include <ArborX_Point.hpp>
-#include <detail/ArborX_GeometryAlgorithms.hpp>
 #include <kokkos_ext/ArborX_KokkosExtArithmeticTraits.hpp>
 #include <misc/ArborX_Vector.hpp>
 

src/geometry/ArborX_Ray.hpp

@@ -15,7 +15,7 @@
 #include <ArborX_Point.hpp>
 #include <ArborX_Sphere.hpp>
 #include <ArborX_Triangle.hpp>
-#include <detail/ArborX_GeometryAlgorithms.hpp> // equal
+#include <algorithms/ArborX_Equals.hpp>
 #include <kokkos_ext/ArborX_KokkosExtArithmeticTraits.hpp>
 #include <misc/ArborX_Vector.hpp>
 

src/geometry/ArborX_Segment.hpp

@@ -12,7 +12,6 @@
 #define ARBORX_SEGMENT_HPP
 
 #include <ArborX_GeometryTraits.hpp>
-#include <detail/ArborX_GeometryAlgorithms.hpp>
 #include <misc/ArborX_Vector.hpp>
 
 #include <Kokkos_Clamp.hpp>

src/geometry/ArborX_Tetrahedron.hpp

@@ -14,7 +14,6 @@
 
 #include <ArborX_GeometryTraits.hpp>
 #include <ArborX_Point.hpp>
-#include <detail/ArborX_GeometryAlgorithms.hpp>
 
 #include <Kokkos_Array.hpp>
 

src/geometry/detail/ArborX_GeometryCentroid.hpp → src/geometry/algorithms/ArborX_Centroid.hpp

@@ -11,7 +11,7 @@
 #ifndef ARBORX_DETAILS_GEOMETRY_CENTROID_HPP
 #define ARBORX_DETAILS_GEOMETRY_CENTROID_HPP
 
-#include "ArborX_GeometryExpand.hpp"
+#include "ArborX_Expand.hpp"
 #include <ArborX_Box.hpp>
 #include <ArborX_GeometryTraits.hpp>
 

src/geometry/detail/ArborX_GeometryDistance.hpp → src/geometry/algorithms/ArborX_Distance.hpp

@@ -11,7 +11,7 @@
 #ifndef ARBORX_DETAILS_GEOMETRY_DISTANCE_HPP
 #define ARBORX_DETAILS_GEOMETRY_DISTANCE_HPP
 
-#include "ArborX_GeometryEquals.hpp"
+#include "ArborX_Equals.hpp"
 #include <ArborX_GeometryTraits.hpp>
 #include <misc/ArborX_Vector.hpp>
 

src/geometry/detail/ArborX_GeometryIntersects.hpp → src/geometry/algorithms/ArborX_Intersects.hpp

@@ -11,8 +11,8 @@
 #ifndef ARBORX_DETAILS_GEOMETRY_INTERSECTS_HPP
 #define ARBORX_DETAILS_GEOMETRY_INTERSECTS_HPP
 
-#include "ArborX_GeometryDistance.hpp"
-#include "ArborX_GeometryExpand.hpp"
+#include "ArborX_Distance.hpp"
+#include "ArborX_Expand.hpp"
 #include <ArborX_GeometryTraits.hpp>
 
 #include <Kokkos_Array.hpp>

src/geometry/detail/ArborX_GeometryAlgorithms.hpp → src/geometry/algorithms/ArborX_Reducer.hpp

@@ -8,18 +8,11 @@
  *                                                                          *
  * SPDX-License-Identifier: BSD-3-Clause                                    *
  ****************************************************************************/
-#ifndef ARBORX_ALGORITHMS_HPP
-#define ARBORX_ALGORITHMS_HPP
-
-#include "ArborX_GeometryCentroid.hpp"
-#include "ArborX_GeometryConvert.hpp"
-#include "ArborX_GeometryDistance.hpp"
-#include "ArborX_GeometryEquals.hpp"
-#include "ArborX_GeometryExpand.hpp"
-#include "ArborX_GeometryIntersects.hpp"
-#include "ArborX_GeometryValid.hpp"
+
+#ifndef ARBORX_REDUCER_HPP
+#define ARBORX_REDUCER_HPP
+
 #include <ArborX_GeometryTraits.hpp>
-#include <misc/ArborX_Vector.hpp>
 
 #include <Kokkos_Core.hpp>
 
@@ -73,25 +66,6 @@ struct GeometryReducer
   bool references_scalar() const { return _references_scalar; }
 };
 
-// transformation that maps the unit cube into a new axis-aligned box
-// NOTE safe to perform in-place
-template <typename Point, typename Box,
-          std::enable_if_t<GeometryTraits::is_point_v<Point> &&
-                           GeometryTraits::is_box_v<Box>> * = nullptr>
-KOKKOS_FUNCTION void translateAndScale(Point const &in, Point &out,
-                                       Box const &ref)
-{
-  static_assert(GeometryTraits::dimension_v<Point> ==
-                GeometryTraits::dimension_v<Box>);
-  constexpr int DIM = GeometryTraits::dimension_v<Point>;
-  for (int d = 0; d < DIM; ++d)
-  {
-    auto const a = ref.minCorner()[d];
-    auto const b = ref.maxCorner()[d];
-    out[d] = (a != b ? (in[d] - a) / (b - a) : 0);
-  }
-}
-
 } // namespace ArborX::Details
 
 #endif

src/geometry/algorithms/ArborX_TranslateAndScale.hpp

@@ -0,0 +1,41 @@
+/****************************************************************************
+ * Copyright (c) 2017-2022 by the ArborX authors                            *
+ * All rights reserved.                                                     *
+ *                                                                          *
+ * This file is part of the ArborX library. ArborX is                       *
+ * distributed under a BSD 3-clause license. For the licensing terms see    *
+ * the LICENSE file in the top-level directory.                             *
+ *                                                                          *
+ * SPDX-License-Identifier: BSD-3-Clause                                    *
+ ****************************************************************************/
+
+#ifndef ARBORX_TRANSLATE_AND_SCALE_HPP
+#define ARBORX_TRANSLATE_AND_SCALE_HPP
+
+#include <ArborX_GeometryTraits.hpp>
+
+#include <Kokkos_Macros.hpp>
+
+namespace ArborX::Details
+{
+// transformation that maps the unit cube into a new axis-aligned box
+// NOTE safe to perform in-place
+template <typename Point, typename Box,
+          std::enable_if_t<GeometryTraits::is_point_v<Point> &&
+                           GeometryTraits::is_box_v<Box>> * = nullptr>
+KOKKOS_FUNCTION void translateAndScale(Point const &in, Point &out,
+                                       Box const &ref)
+{
+  static_assert(GeometryTraits::dimension_v<Point> ==
+                GeometryTraits::dimension_v<Box>);
+  constexpr int DIM = GeometryTraits::dimension_v<Point>;
+  for (int d = 0; d < DIM; ++d)
+  {
+    auto const a = ref.minCorner()[d];
+    auto const b = ref.maxCorner()[d];
+    out[d] = (a != b ? (in[d] - a) / (b - a) : 0);
+  }
+}
+} // namespace ArborX::Details
+
+#endif

src/interpolation/detail/ArborX_InterpDetailsCompactRadialBasisFunction.hpp

@@ -13,7 +13,7 @@
 #define ARBORX_INTERP_COMPACT_RADIAL_BASIS_FUNCTION_HPP
 
 #include <ArborX_GeometryTraits.hpp>
-#include <detail/ArborX_GeometryAlgorithms.hpp>
+#include <algorithms/ArborX_Distance.hpp>
 
 #include <Kokkos_Core.hpp>
 

src/spatial/detail/ArborX_BatchedQueries.hpp

@@ -13,7 +13,6 @@
 #define ARBORX_BATCHED_QUERIES_HPP
 
 #include <ArborX_Box.hpp>
-#include <detail/ArborX_GeometryAlgorithms.hpp> // returnCentroid, translateAndScale
 #include <detail/ArborX_SpaceFillingCurves.hpp>
 #include <misc/ArborX_SortUtils.hpp> // sortObjects
 

src/spatial/detail/ArborX_BruteForceImpl.hpp

@@ -12,9 +12,10 @@
 #ifndef ARBORX_BRUTE_FORCE_IMPL_HPP
 #define ARBORX_BRUTE_FORCE_IMPL_HPP
 
-#include <detail/ArborX_GeometryAlgorithms.hpp> // expand
+#include <algorithms/ArborX_Reducer.hpp>
 #include <detail/ArborX_NearestBufferProvider.hpp>
 #include <detail/ArborX_Predicates.hpp>
+#include <kokkos_ext/ArborX_KokkosExtArithmeticTraits.hpp>
 #include <kokkos_ext/ArborX_KokkosExtStdAlgorithms.hpp>
 #include <kokkos_ext/ArborX_KokkosExtViewHelpers.hpp>
 #include <misc/ArborX_Exception.hpp>

src/spatial/detail/ArborX_PredicateHelpers.hpp

@@ -13,6 +13,7 @@
 
 #include <ArborX_GeometryTraits.hpp>
 #include <ArborX_Sphere.hpp>
+#include <algorithms/ArborX_Convert.hpp>
 #include <detail/ArborX_AccessTraits.hpp>
 #include <detail/ArborX_Predicates.hpp>
 

src/spatial/detail/ArborX_Predicates.hpp

@@ -11,7 +11,12 @@
 #ifndef ARBORX_PREDICATE_HPP
 #define ARBORX_PREDICATE_HPP
 
-#include <detail/ArborX_GeometryAlgorithms.hpp>
+#include <algorithms/ArborX_Distance.hpp>
+#include <algorithms/ArborX_Intersects.hpp>
+
+#include <Kokkos_Macros.hpp>
+
+#include <type_traits>
 
 namespace ArborX
 {

src/spatial/detail/ArborX_SpaceFillingCurves.hpp

@@ -14,7 +14,8 @@
 
 #include <ArborX_Box.hpp>
 #include <ArborX_Point.hpp>
-#include <detail/ArborX_GeometryAlgorithms.hpp>
+#include <algorithms/ArborX_Centroid.hpp>
+#include <algorithms/ArborX_TranslateAndScale.hpp>
 #include <detail/ArborX_MortonCode.hpp>
 
 #include <Kokkos_DetectionIdiom.hpp>

src/spatial/detail/ArborX_TreeConstruction.hpp

@@ -12,8 +12,9 @@
 #ifndef ARBORX_TREE_CONSTRUCTION_HPP
 #define ARBORX_TREE_CONSTRUCTION_HPP
 
-#include <detail/ArborX_GeometryAlgorithms.hpp> // expand
-#include <detail/ArborX_Node.hpp>               // makeLeafNode
+#include <algorithms/ArborX_Expand.hpp>
+#include <algorithms/ArborX_Reducer.hpp>
+#include <detail/ArborX_Node.hpp> // makeLeafNode
 #include <detail/ArborX_SpaceFillingCurves.hpp>
 #include <kokkos_ext/ArborX_KokkosExtArithmeticTraits.hpp>
 #include <misc/ArborX_Exception.hpp>

src/spatial/detail/ArborX_TreeTraversal.hpp

@@ -11,7 +11,6 @@
 #ifndef ARBORX_TREE_TRAVERSAL_HPP
 #define ARBORX_TREE_TRAVERSAL_HPP
 
-#include <detail/ArborX_GeometryAlgorithms.hpp>
 #include <detail/ArborX_HappyTreeFriends.hpp>
 #include <detail/ArborX_NearestBufferProvider.hpp>
 #include <detail/ArborX_Node.hpp> // ROPE_SENTINEL

test/ArborXTest_LegacyTree.hpp

@@ -14,7 +14,6 @@
 
 #include <detail/ArborX_AccessTraits.hpp>
 #include <detail/ArborX_Callbacks.hpp>
-#include <detail/ArborX_GeometryAlgorithms.hpp>
 #include <detail/ArborX_PairValueIndex.hpp>
 
 #include <Kokkos_Macros.hpp>

test/tstBoostGeometryAdapters.cpp

@@ -12,7 +12,11 @@
 #include "ArborX_BoostGeometryAdapters.hpp"
 #include <ArborX_Box.hpp>
 #include <ArborX_Point.hpp>
-#include <detail/ArborX_GeometryAlgorithms.hpp>
+#include <algorithms/ArborX_Centroid.hpp>
+#include <algorithms/ArborX_Distance.hpp>
+#include <algorithms/ArborX_Equals.hpp>
+#include <algorithms/ArborX_Intersects.hpp>
+#include <algorithms/ArborX_Valid.hpp>
 
 #include <boost/test/unit_test.hpp>
 

test/tstBoostRangeAdapters.cpp

@@ -13,7 +13,7 @@
 #include "ArborX_EnableViewComparison.hpp"
 #include <ArborX_Box.hpp>
 #include <ArborX_Point.hpp>
-#include <detail/ArborX_GeometryAlgorithms.hpp>
+#include <algorithms/ArborX_Distance.hpp>
 
 #include <Kokkos_Core.hpp>
 

test/tstDetailsAlgorithms.cpp

@@ -15,7 +15,13 @@
 #include <ArborX_Sphere.hpp>
 #include <ArborX_Tetrahedron.hpp>
 #include <ArborX_Triangle.hpp>
-#include <detail/ArborX_GeometryAlgorithms.hpp>
+#include <algorithms/ArborX_Centroid.hpp>
+#include <algorithms/ArborX_Convert.hpp>
+#include <algorithms/ArborX_Distance.hpp>
+#include <algorithms/ArborX_Equals.hpp>
+#include <algorithms/ArborX_Expand.hpp>
+#include <algorithms/ArborX_Intersects.hpp>
+#include <algorithms/ArborX_Valid.hpp>
 #include <kokkos_ext/ArborX_KokkosExtArithmeticTraits.hpp>
 
 #include <boost/mpl/list.hpp>

test/tstDetailsGeometryReducer.cpp

@@ -11,7 +11,9 @@
 
 #include "ArborX_EnableDeviceTypes.hpp" // ARBORX_DEVICE_TYPES
 #include <ArborX_Box.hpp>
-#include <detail/ArborX_GeometryAlgorithms.hpp>
+#include <algorithms/ArborX_Equals.hpp>
+#include <algorithms/ArborX_Expand.hpp>
+#include <algorithms/ArborX_Reducer.hpp>
 
 #include <Kokkos_Core.hpp>
 

test/tstDetailsTreeConstruction.cpp

@@ -11,7 +11,6 @@
 #include "ArborXTest_LegacyTree.hpp"
 #include "ArborX_EnableDeviceTypes.hpp" // ARBORX_DEVICE_TYPES
 #include "ArborX_EnableViewComparison.hpp"
-#include <detail/ArborX_GeometryAlgorithms.hpp>
 #include <detail/ArborX_IndexableGetter.hpp>
 #include <detail/ArborX_MortonCode.hpp> // expandBits, morton32
 #include <detail/ArborX_Node.hpp>       // ROPE SENTINEL

test/tstInterpDetailsCompactRadialBasisFunction.cpp

@@ -12,7 +12,6 @@
 #include "ArborX_EnableDeviceTypes.hpp"
 #include "ArborX_EnableViewComparison.hpp"
 #include <ArborX_Point.hpp>
-#include <detail/ArborX_GeometryAlgorithms.hpp>
 #include <detail/ArborX_InterpDetailsCompactRadialBasisFunction.hpp>
 
 #include "BoostTest_CUDA_clang_workarounds.hpp"

test/tstKDOP.cpp

@@ -12,7 +12,7 @@
 #include <ArborX_Box.hpp>
 #include <ArborX_KDOP.hpp>
 #include <ArborX_Point.hpp>
-#include <detail/ArborX_GeometryAlgorithms.hpp>
+#include <algorithms/ArborX_Intersects.hpp>
 
 #include "BoostTest_CUDA_clang_workarounds.hpp"
 #include <boost/test/unit_test.hpp>