review changes

Author: benoit2776

bindings/python/src/geometry/nn_search.cpp

@@ -39,7 +39,7 @@
         .def( "neighbors", &NNSearch##dimension##D::neighbors )                \
         .def( "radius_colocated_index_mapping",                                \
             static_cast< NNSearch##dimension##D::ColocatedInfo (               \
-                NNSearch##dimension##D::* )( const double ) const >(           \
+                NNSearch##dimension##D::* )( double ) const >(                 \
                 &NNSearch##dimension##D::colocated_index_mapping ) )           \
         .def( "frame_colocated_index_mapping",                                 \
             static_cast< NNSearch##dimension##D::ColocatedInfo (               \

include/geode/geometry/nn_search.hpp

@@ -28,11 +28,12 @@
 
 #include <geode/geometry/basic_objects/ellipse.hpp>
 #include <geode/geometry/common.hpp>
-#include <geode/geometry/frame.hpp>
 #include <geode/geometry/point.hpp>
 
 namespace geode
 {
+    FORWARD_DECLARATION_DIMENSION_CLASS( Frame );
+
     /*!
      * Given a list of points, this class returns neighboring points.
      */
@@ -138,7 +139,7 @@ namespace geode
          * @return The information related to this colocated operation
          */
         [[nodiscard]] ColocatedInfo colocated_index_mapping(
-            const double epsilon ) const;
+            double epsilon ) const;
 
         [[nodiscard]] ColocatedInfo colocated_index_mapping(
             const Frame< dimension >& epsilon ) const;

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

@@ -72,7 +72,7 @@ namespace geode
             ~SolidMeshMerger();
 
             [[nodiscard]] std::unique_ptr< SolidMesh< dimension > > merge(
-                const double epsilon );
+                double epsilon );
 
             [[nodiscard]] std::unique_ptr< SolidMesh< dimension > > merge(
                 const Frame< dimension >& epsilons_frame );

src/geode/geometry/nn_search.cpp

@@ -24,6 +24,7 @@
 #include <geode/geometry/nn_search.hpp>
 
 #include <geode/geometry/basic_objects/segment.hpp>
+#include <geode/geometry/frame.hpp>
 #include <geode/geometry/intersection.hpp>
 
 #include <mutex>
@@ -309,9 +310,8 @@ namespace geode
         {
             OPENGEODE_EXCEPTION(
                 epsilons_frame.direction( d ).length() >= GLOBAL_EPSILON,
-                "[NNSearch::colocated_index_mapping] Given epsilon too "
-                "small, "
-                "should be bigger than GLOBAL_EPSILON (i.e. ",
+                "[NNSearch::colocated_index_mapping] Given epsilon is too "
+                "small, should be bigger than GLOBAL_EPSILON (i.e. ",
                 GLOBAL_EPSILON, ")" );
         }
         return impl_->colocated_index_mapping( *this, epsilons_frame );

src/geode/mesh/helpers/detail/solid_merger.cpp

@@ -85,7 +85,7 @@ namespace geode
             }
 
             std::unique_ptr< SolidMesh< dimension > > merge(
-                SolidMeshMerger< dimension >& merger, const double epsilon )
+                SolidMeshMerger< dimension >& merger, double epsilon )
             {
                 merger.create_points( epsilon );
                 create_polyhedra( merger );
@@ -341,7 +341,7 @@ namespace geode
 
         template < index_t dimension >
         std::unique_ptr< SolidMesh< dimension > >
-            SolidMeshMerger< dimension >::merge( const double epsilon )
+            SolidMeshMerger< dimension >::merge( double epsilon )
         {
             return impl_->merge( *this, epsilon );
         }

src/geode/mesh/helpers/detail/vertex_merger.cpp

@@ -106,7 +106,7 @@ namespace geode
                 return *builder_;
             }
 
-            void create_points( const double epsilon )
+            void create_points( double epsilon )
             {
                 auto info = create_colocated_index_mapping( epsilon );
                 vertices_ = std::move( info.colocated_mapping );
@@ -147,28 +147,8 @@ namespace geode
             }
 
         private:
-            ColocatedInfo create_colocated_index_mapping( const double epsilon )
-            {
-                index_t nb_points{ 0 };
-                for( const auto& mesh : meshes_ )
-                {
-                    nb_points += mesh.get().nb_vertices();
-                }
-                std::vector< Point< dimension > > points;
-                points.reserve( nb_points );
-                for( const auto& mesh : meshes_ )
-                {
-                    for( const auto v : Range{ mesh.get().nb_vertices() } )
-                    {
-                        points.emplace_back( mesh.get().point( v ) );
-                    }
-                }
-                NNSearch< dimension > nnsearch{ std::move( points ) };
-                return nnsearch.colocated_index_mapping( epsilon );
-            }
-
-            ColocatedInfo create_colocated_index_mapping(
-                const Frame< dimension >& epsilon )
+            template < typename EpsilonType >
+            ColocatedInfo create_colocated_index_mapping( EpsilonType epsilon )
             {
                 index_t nb_points{ 0 };
                 for( const auto& mesh : meshes_ )
@@ -218,8 +198,8 @@ namespace geode
         }
 
         template < typename Mesh >
-        auto VertexMerger< Mesh >::vertex_origins(
-            index_t vertex ) const -> const VertexOrigins&
+        auto VertexMerger< Mesh >::vertex_origins( index_t vertex ) const
+            -> const VertexOrigins&
         {
             return impl_->vertex_origins( vertex );
         }