From 6104cce18b3927cb66491ed037d30dd71601e765 Mon Sep 17 00:00:00 2001
From: Andreas Fabri <andreas.fabri@geometryfactory.com>
Date: Fri, 27 Dec 2024 15:19:53 +0000
Subject: [PATCH] Rename to CGAL::Frechet_distance::Neighbor_search

---
 .../examples/Frechet_distance/Frechet_DS_3.cpp    |  4 ++--
 .../Neighbor_search.h}                            | 15 ++++++++-------
 ...ance_near_neighbors_ds.h => Neighbor_search.h} |  7 +++----
 3 files changed, 13 insertions(+), 13 deletions(-)
 rename Frechet_distance/include/CGAL/{Frechet_distance_near_neighbors_ds.h => Frechet_distance/Neighbor_search.h} (89%)
 rename Frechet_distance/include/CGAL/Frechet_distance/internal/{Frechet_distance_near_neighbors_ds.h => Neighbor_search.h} (97%)

diff --git a/Frechet_distance/examples/Frechet_distance/Frechet_DS_3.cpp b/Frechet_distance/examples/Frechet_distance/Frechet_DS_3.cpp
index 792778c25e2..9894f0276ae 100644
--- a/Frechet_distance/examples/Frechet_distance/Frechet_DS_3.cpp
+++ b/Frechet_distance/examples/Frechet_distance/Frechet_DS_3.cpp
@@ -1,6 +1,6 @@
 #include <CGAL/Frechet_distance.h>
 #include <CGAL/Frechet_distance_traits_3.h>
-#include <CGAL/Frechet_distance_near_neighbors_ds.h>
+#include <CGAL/Frechet_distance/Neighbor_search.h>
 #include <CGAL/Simple_cartesian.h>
 #include <CGAL/IO/WKT.h>
 
@@ -29,7 +29,7 @@ int main(int argc, char* argv[])
   Curve query = curves.back();
   curves.pop_back();
 
-  CGAL::FrechetDistanceNearNeighborsDS<Curve, Traits> ds;
+  CGAL::Frechet_distance::Neighbor_search<Curve, Traits> ds;
   ds.insert(curves);
 
   for(const Curve& c : curves){
diff --git a/Frechet_distance/include/CGAL/Frechet_distance_near_neighbors_ds.h b/Frechet_distance/include/CGAL/Frechet_distance/Neighbor_search.h
similarity index 89%
rename from Frechet_distance/include/CGAL/Frechet_distance_near_neighbors_ds.h
rename to Frechet_distance/include/CGAL/Frechet_distance/Neighbor_search.h
index 360f1b35f13..a90622585c3 100644
--- a/Frechet_distance/include/CGAL/Frechet_distance_near_neighbors_ds.h
+++ b/Frechet_distance/include/CGAL/Frechet_distance/Neighbor_search.h
@@ -19,13 +19,13 @@
 #include <CGAL/license/Frechet_distance.h>
 #include <CGAL/Frechet_distance.h>
 #include <CGAL/basic.h>
-#include <CGAL/Frechet_distance/internal/Frechet_distance_near_neighbors_ds.h>
+#include <CGAL/Frechet_distance/internal/Neighbor_search.h>
 
 #include <iterator>
 #include <vector>
 
-namespace CGAL
-{
+namespace CGAL {
+namespace Frechet_distance {
 
 // TODO: hide away in Frechet_distance_::internal (different naming but nvm)
 template <typename PointRange>
@@ -34,7 +34,7 @@ using PointRangeKernel = typename CGAL::Kernel_traits<
     Kernel;  // TODO: replace by CORE type for initial testing
 
 template <class PointRange, class Traits = PointRangeKernel<PointRange>>
-class FrechetDistanceNearNeighborsDS
+class Neighbor_search
 {
     using PT = Traits; //  Polyline_traits_2<Traits, double>;
     using FT = typename PT::FT;
@@ -45,7 +45,7 @@ class FrechetDistanceNearNeighborsDS
     using PolylineIDs = std::vector<PolylineID>;
 
 public:
-    FrechetDistanceNearNeighborsDS() = default;
+    Neighbor_search() = default;
 
     void insert(const Polyline& curve);
     void insert(const Polylines& curves);
@@ -59,7 +59,7 @@ private:
 
 // TODO: store preprocessed curves after CGALization
 template <class PointRange, class Traits>
-void FrechetDistanceNearNeighborsDS<PointRange, Traits>::insert(
+void Neighbor_search<PointRange, Traits>::insert(
     const Polylines& curves)
 {
     this->curves = curves;  // FIXME: copies all the curves...
@@ -69,7 +69,7 @@ void FrechetDistanceNearNeighborsDS<PointRange, Traits>::insert(
 }
 
 template <class PointRange, class Traits>
-auto FrechetDistanceNearNeighborsDS<PointRange, Traits>::get_close_curves(
+auto Neighbor_search<PointRange, Traits>::get_close_curves(
     const Polyline& curve, double distance) -> PolylineIDs
 {
     auto result = kd_tree.search(curve, distance);
@@ -86,6 +86,7 @@ auto FrechetDistanceNearNeighborsDS<PointRange, Traits>::get_close_curves(
     return result;
 }
 
+}
 }  // end of namespace CGAL
 
 #endif  // CGAL_FRECHET_DISTANCE_NEAR_NEIGHBORS_DS_H
diff --git a/Frechet_distance/include/CGAL/Frechet_distance/internal/Frechet_distance_near_neighbors_ds.h b/Frechet_distance/include/CGAL/Frechet_distance/internal/Neighbor_search.h
similarity index 97%
rename from Frechet_distance/include/CGAL/Frechet_distance/internal/Frechet_distance_near_neighbors_ds.h
rename to Frechet_distance/include/CGAL/Frechet_distance/internal/Neighbor_search.h
index 90706a9477f..62c9e35fcdb 100644
--- a/Frechet_distance/include/CGAL/Frechet_distance/internal/Frechet_distance_near_neighbors_ds.h
+++ b/Frechet_distance/include/CGAL/Frechet_distance/internal/Neighbor_search.h
@@ -13,8 +13,7 @@
 //                 Andreas Fabri
 // =============================================================================
 
-#ifndef CGAL_INTERNAL_FRECHET_DISTANCE_NEAR_NEIGHBORS_DS_H
-#define CGAL_INTERNAL_FRECHET_DISTANCE_NEAR_NEIGHBORS_DS_H
+#pragma once
 #include <CGAL/license/Frechet_distance.h>
 #include <CGAL/Dimension.h>
 #include <CGAL/Kd_tree.h>
@@ -287,7 +286,7 @@ auto FrechetKdTree<Traits>::search(Polyline const& curve, FT distance)
 }
 
 } // namespace internal
-} // namespace Frechet_distance_
+} // namespace Frechet_distance
 }  // end of namespace CGAL
 
-#endif  // CGAL_INTERNAL_FRECHET_DISTANCE_NEAR_NEIGHBORS_DS_H
+