feat(NNSearch): adding ellispsoid neighbor search

Author: benoit2776

bindings/python/src/geometry/nn_search.cpp

@@ -35,9 +35,17 @@
         .def( "point", &NNSearch##dimension##D::point )                        \
         .def( "closest_neighbor", &NNSearch##dimension##D::closest_neighbor )  \
         .def( "radius_neighbors", &NNSearch##dimension##D::radius_neighbors )  \
+        .def( "frame_neighbors", &NNSearch##dimension##D::frame_neighbors )    \
         .def( "neighbors", &NNSearch##dimension##D::neighbors )                \
-        .def( "colocated_index_mapping",                                       \
-            &NNSearch##dimension##D::colocated_index_mapping );                \
+        .def( "radius_colocated_index_mapping",                                \
+            static_cast< NNSearch##dimension##D::ColocatedInfo (               \
+                NNSearch##dimension##D::* )( const double ) const >(           \
+                &NNSearch##dimension##D::colocated_index_mapping ) )           \
+        .def( "frame_colocated_index_mapping",                                 \
+            static_cast< NNSearch##dimension##D::ColocatedInfo (               \
+                NNSearch##dimension##D::* )( const Frame##dimension##D& )      \
+                    const >(                                                   \
+                &NNSearch##dimension##D::colocated_index_mapping ) );          \
                                                                                \
     const auto info##dimension =                                               \
         "ColocatedInfo" + std::to_string( dimension ) + "D";                   \
@@ -50,7 +58,7 @@
         .def( "nb_unique_points",                                              \
             &NNSearch##dimension##D::ColocatedInfo::nb_unique_points )         \
         .def( "nb_colocated_points",                                           \
-            &NNSearch##dimension##D::ColocatedInfo::nb_colocated_points )
+            &NNSearch##dimension##D::ColocatedInfo::nb_colocated_points );
 
 namespace geode
 {

include/geode/geometry/nn_search.hpp

@@ -28,6 +28,7 @@
 
 #include <geode/geometry/basic_objects/ellipse.hpp>
 #include <geode/geometry/common.hpp>
+#include <geode/geometry/frame.hpp>
 #include <geode/geometry/point.hpp>
 
 namespace geode
@@ -115,10 +116,9 @@ namespace geode
          * @param[in] threshold_distance The radius of the sphere
          * @return the list of points inside this distance
          */
-        [[nodiscard]] std::vector< index_t > ellipsoid_radius_neighbors(
+        [[nodiscard]] std::vector< index_t > frame_neighbors(
             const Point< dimension >& point,
-            const Ellipse< dimension >& ellipse,
-            const double distance_factor ) const;
+            const Frame< dimension >& epsilons_frame ) const;
 
         /*!
          * Get a number ol close neighbors from the given point
@@ -138,7 +138,10 @@ namespace geode
          * @return The information related to this colocated operation
          */
         [[nodiscard]] ColocatedInfo colocated_index_mapping(
-            double epsilon ) const;
+            const double epsilon ) const;
+
+        [[nodiscard]] ColocatedInfo colocated_index_mapping(
+            const Frame< dimension >& epsilon ) const;
 
     private:
         IMPLEMENTATION_MEMBER( impl_ );

include/geode/mesh/helpers/detail/curve_merger.hpp

@@ -41,7 +41,8 @@ namespace geode
     namespace detail
     {
         template < index_t dimension >
-        class EdgedCurveMerger : public VertexMerger< EdgedCurve< dimension > >
+        class EdgedCurveMerger
+            : public VertexMerger< EdgedCurve< dimension >, dimension >
         {
         public:
             struct EdgeOrigin
@@ -62,12 +63,15 @@ namespace geode
             using EdgeOrigins = absl::InlinedVector< EdgeOrigin, 1 >;
 
             EdgedCurveMerger( absl::Span< const std::reference_wrapper<
-                                  const EdgedCurve< dimension > > > curves,
-                double epsilon );
+                    const EdgedCurve< dimension > > > curves );
             EdgedCurveMerger( EdgedCurveMerger&& ) noexcept;
             ~EdgedCurveMerger();
 
-            [[nodiscard]] std::unique_ptr< EdgedCurve< dimension > > merge();
+            [[nodiscard]] std::unique_ptr< EdgedCurve< dimension > > merge(
+                double epsilon );
+
+            [[nodiscard]] std::unique_ptr< EdgedCurve< dimension > > merge(
+                const Frame< dimension >& epsilons_frame );
 
             [[nodiscard]] index_t edge_in_merged(
                 index_t curve, index_t edge ) const;

include/geode/mesh/helpers/detail/point_set_merger.hpp

@@ -38,16 +38,20 @@ namespace geode
     namespace detail
     {
         template < index_t dimension >
-        class PointSetMerger : public VertexMerger< PointSet< dimension > >
+        class PointSetMerger
+            : public VertexMerger< PointSet< dimension >, dimension >
         {
         public:
             PointSetMerger( absl::Span< const std::reference_wrapper<
-                                const PointSet< dimension > > > pointsets,
-                double epsilon );
+                    const PointSet< dimension > > > pointsets );
             PointSetMerger( PointSetMerger&& ) noexcept;
             ~PointSetMerger();
 
-            [[nodiscard]] std::unique_ptr< PointSet< dimension > > merge();
+            [[nodiscard]] std::unique_ptr< PointSet< dimension > > merge(
+                double epsilon );
+
+            [[nodiscard]] std::unique_ptr< PointSet< dimension > > merge(
+                const Frame3D& frame, const double factor_distance );
         };
         ALIAS_2D_AND_3D( PointSetMerger );
     } // namespace detail

include/geode/mesh/helpers/detail/solid_merger.hpp

@@ -31,6 +31,8 @@
 #include <geode/mesh/common.hpp>
 #include <geode/mesh/helpers/detail/vertex_merger.hpp>
 
+#include <geode/geometry/frame.hpp>
+
 namespace geode
 {
     FORWARD_DECLARATION_DIMENSION_CLASS( SolidMesh );
@@ -41,7 +43,8 @@ namespace geode
     namespace detail
     {
         template < index_t dimension >
-        class SolidMeshMerger : public VertexMerger< SolidMesh< dimension > >
+        class SolidMeshMerger
+            : public VertexMerger< SolidMesh< dimension >, dimension >
         {
         public:
             struct PolyhedronOrigin
@@ -65,12 +68,15 @@ namespace geode
                 absl::InlinedVector< PolyhedronOrigin, 1 >;
 
             SolidMeshMerger( absl::Span< const std::reference_wrapper<
-                                 const SolidMesh< dimension > > > solids,
-                double epsilon );
+                    const SolidMesh< dimension > > > solids );
             SolidMeshMerger( SolidMeshMerger&& ) noexcept;
             ~SolidMeshMerger();
 
-            [[nodiscard]] std::unique_ptr< SolidMesh< dimension > > merge();
+            [[nodiscard]] std::unique_ptr< SolidMesh< dimension > > merge(
+                double epsilon );
+
+            [[nodiscard]] std::unique_ptr< SolidMesh< dimension > > merge(
+                const Frame< dimension >& epsilons_frame );
 
             [[nodiscard]] index_t polyhedron_in_merged(
                 index_t solid, index_t polyhedron ) const;

include/geode/mesh/helpers/detail/surface_merger.hpp

@@ -42,7 +42,7 @@ namespace geode
     {
         template < index_t dimension >
         class SurfaceMeshMerger
-            : public VertexMerger< SurfaceMesh< dimension > >
+            : public VertexMerger< SurfaceMesh< dimension >, dimension >
         {
         public:
             struct PolygonOrigin
@@ -64,12 +64,15 @@ namespace geode
             using PolygonOrigins = absl::InlinedVector< PolygonOrigin, 1 >;
 
             SurfaceMeshMerger( absl::Span< const std::reference_wrapper<
-                                   const SurfaceMesh< dimension > > > surfaces,
-                double epsilon );
+                    const SurfaceMesh< dimension > > > surfaces );
             SurfaceMeshMerger( SurfaceMeshMerger&& ) noexcept;
             ~SurfaceMeshMerger();
 
-            [[nodiscard]] std::unique_ptr< SurfaceMesh< dimension > > merge();
+            [[nodiscard]] std::unique_ptr< SurfaceMesh< dimension > > merge(
+                double epsilon );
+
+            [[nodiscard]] std::unique_ptr< SurfaceMesh< dimension > > merge(
+                const Frame< dimension >& epsilons_frame );
 
             [[nodiscard]] index_t polygon_in_merged(
                 index_t surface, index_t polygon ) const;

include/geode/mesh/helpers/detail/vertex_merger.hpp

@@ -28,11 +28,13 @@
 
 #include <geode/basic/pimpl.hpp>
 
+#include <geode/geometry/frame.hpp>
+
 namespace geode
 {
     namespace detail
     {
-        template < typename Mesh >
+        template < typename Mesh, index_t dimension >
         class VertexMerger
         {
         public:
@@ -57,9 +59,14 @@ namespace geode
                 index_t vertex ) const;
 
         protected:
+            // VertexMerger(
+            //     absl::Span< const std::reference_wrapper< const Mesh > >
+            //     meshes, double epsilon );
+
             VertexMerger(
-                absl::Span< const std::reference_wrapper< const Mesh > > meshes,
-                double epsilon );
+                absl::Span< const std::reference_wrapper< const Mesh > >
+                    meshes );
+
             VertexMerger( VertexMerger&& ) noexcept;
             ~VertexMerger();
 
@@ -73,7 +80,9 @@ namespace geode
 
             [[nodiscard]] Builder& builder();
 
-            void create_points();
+            void create_points( double epsilon );
+
+            void create_points( const Frame< dimension >& epsilons_frame );
 
         private:
             IMPLEMENTATION_MEMBER( impl_ );