From 9f99b90beaa8a9bdfc9627ce8268371dfd355f60 Mon Sep 17 00:00:00 2001
From: Yohann Bosqued <bosq.yohann@gmail.com>
Date: Tue, 26 Dec 2023 21:30:43 -0500
Subject: [PATCH] Renaming external predicates / callback

---
 .../ArborX_InterpMovingLeastSquares.hpp       | 20 +++++++++----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/interpolation/ArborX_InterpMovingLeastSquares.hpp b/src/interpolation/ArborX_InterpMovingLeastSquares.hpp
index 7919d0203..c6f418301 100644
--- a/src/interpolation/ArborX_InterpMovingLeastSquares.hpp
+++ b/src/interpolation/ArborX_InterpMovingLeastSquares.hpp
@@ -32,7 +32,7 @@ namespace ArborX::Interpolation::Details
 
 // This is done to avoid a clash with another predicates access trait
 template <typename TargetAccess>
-struct MLSTargetPointsPredicateWrapper
+struct MLSPredicateWrapper
 {
   TargetAccess target_access;
   int num_neighbors;
@@ -40,7 +40,7 @@ struct MLSTargetPointsPredicateWrapper
 
 // Functor used in the tree query to create the 2D source view and indices
 template <typename SourceView, typename IndicesView, typename CounterView>
-struct SearchNeighborsCallback
+struct MLSSearchNeighborsCallback
 {
   SourceView source_view;
   IndicesView indices;
@@ -67,12 +67,10 @@ namespace ArborX
 {
 
 template <typename TargetAccess>
-struct AccessTraits<
-    Interpolation::Details::MLSTargetPointsPredicateWrapper<TargetAccess>,
-    PredicatesTag>
+struct AccessTraits<Interpolation::Details::MLSPredicateWrapper<TargetAccess>,
+                    PredicatesTag>
 {
-  using Self =
-      Interpolation::Details::MLSTargetPointsPredicateWrapper<TargetAccess>;
+  using Self = Interpolation::Details::MLSPredicateWrapper<TargetAccess>;
 
   KOKKOS_FUNCTION static auto size(Self const &tp)
   {
@@ -233,8 +231,8 @@ class MovingLeastSquares
         source_tree(space, ArborX::Experimental::attach_indices(source_access));
 
     // Create the predicates
-    Details::MLSTargetPointsPredicateWrapper<TargetAccess> predicates{
-        target_access, _num_neighbors};
+    Details::MLSPredicateWrapper<TargetAccess> predicates{target_access,
+                                                          _num_neighbors};
 
     // Create the callback
     Kokkos::View<SourcePoint **, MemorySpace> source_view(
@@ -247,8 +245,8 @@ class MovingLeastSquares
         _num_targets, _num_neighbors);
     Kokkos::View<int *, MemorySpace> counter(
         "ArborX::MovingLeastSquares::counter", _num_targets);
-    Details::SearchNeighborsCallback<decltype(source_view), decltype(_indices),
-                                     decltype(counter)>
+    Details::MLSSearchNeighborsCallback<decltype(source_view),
+                                        decltype(_indices), decltype(counter)>
         callback{source_view, _indices, counter};
 
     // Query the source tree