perf(TetrahedralSolidBuilder): improve the creation of edges and face…

…ts at tetrahedron creation
Geode-solutions · Apr 17, 2020 · fd92a54 · fd92a54
1 parent bf9e892
commit fd92a54
Show file tree

Hide file tree

Showing 8 changed files with 51 additions and 35 deletions.
diff --git a/include/geode/mesh/builder/tetrahedral_solid_builder.h b/include/geode/mesh/builder/tetrahedral_solid_builder.h
@@ -61,6 +61,12 @@ namespace geode
          */
         index_t create_tetrahedra( index_t nb );
 
+        /*!
+         * Reserve storage for new tetrahedra without creating them.
+         * @param[in] nb Number of tetrahedra to reserve
+         */
+        void reserve_tetrahedra( index_t nb );
+
         void copy(
             const TetrahedralSolid< dimension >& tetrahedral_solid, BuilderKey )
         {

diff --git a/include/geode/mesh/builder/triangulated_surface_builder.h b/include/geode/mesh/builder/triangulated_surface_builder.h
@@ -70,6 +70,12 @@ namespace geode
          */
         index_t create_triangles( index_t nb );
 
+        /*!
+         * Reserve storage for new triangles without creating them.
+         * @param[in] nb Number of triangles to reserve
+         */
+        void reserve_triangles( index_t nb );
+
         void copy( const TriangulatedSurface< dimension >& triangulated_surface,
             BuilderKey )
         {

diff --git a/src/geode/mesh/builder/geode_tetrahedral_solid_builder.cpp b/src/geode/mesh/builder/geode_tetrahedral_solid_builder.cpp
@@ -65,22 +65,22 @@ namespace geode
     void OpenGeodeTetrahedralSolidBuilder< dimension >::do_create_facets(
         const std::array< index_t, 4 >& vertices )
     {
-        for( auto&& facet_vertices :
-            get_tetrahedron_facet_vertices( vertices ) )
-        {
-            this->find_or_create_facet( facet_vertices );
-        }
+        this->find_or_create_facet( { vertices[1], vertices[3], vertices[2] } );
+        this->find_or_create_facet( { vertices[0], vertices[2], vertices[3] } );
+        this->find_or_create_facet( { vertices[3], vertices[1], vertices[0] } );
+        this->find_or_create_facet( { vertices[0], vertices[1], vertices[2] } );
     }
 
     template < index_t dimension >
     void OpenGeodeTetrahedralSolidBuilder< dimension >::do_create_edges(
         const std::array< index_t, 4 >& vertices )
     {
-        for( auto&& edge_vertices :
-            this->get_tetrahedron_edge_vertices( vertices ) )
-        {
-            this->find_or_create_edge( edge_vertices );
-        }
+        this->find_or_create_edge( { vertices[0], vertices[1] } );
+        this->find_or_create_edge( { vertices[0], vertices[2] } );
+        this->find_or_create_edge( { vertices[0], vertices[3] } );
+        this->find_or_create_edge( { vertices[1], vertices[2] } );
+        this->find_or_create_edge( { vertices[1], vertices[3] } );
+        this->find_or_create_edge( { vertices[2], vertices[3] } );
     }
 
     template < index_t dimension >

diff --git a/src/geode/mesh/builder/polyhedral_solid_builder.cpp b/src/geode/mesh/builder/polyhedral_solid_builder.cpp
@@ -353,7 +353,10 @@ namespace geode
         for( auto&& edge_vertices :
             get_polyhedron_edge_vertices( vertices, facets ) )
         {
-            this->find_or_create_edge( edge_vertices );
+            if( edge_vertices[0] < edge_vertices[1] )
+            {
+                this->find_or_create_edge( edge_vertices );
+            }
         }
     }
 

diff --git a/src/geode/mesh/builder/tetrahedral_solid_builder.cpp b/src/geode/mesh/builder/tetrahedral_solid_builder.cpp
@@ -76,8 +76,6 @@ namespace geode
                                                 "tetrahedra are handled" );
         std::array< index_t, 4 > tetra_vertices;
         absl::c_copy_n( vertices, 4, tetra_vertices.begin() );
-        // sort !!!
-        absl::c_sort( tetra_vertices );
         do_create_edges( tetra_vertices );
     }
 
@@ -109,26 +107,21 @@ namespace geode
                 { added_tetra, vertex_id++ }, vertex );
         }
         do_create_tetrahedron( vertices );
-        for( const auto f : Range{ 4 } )
-        {
-            PolyhedronFacet facet{ added_tetra, f };
-            PolyhedronFacetVertices facet_vertices( 3 );
-            for( const auto v : Range{ 3 } )
-            {
-                facet_vertices[v] =
-                    tetrahedral_solid_.polyhedron_facet_vertex( { facet, v } );
-                std::array< index_t, 2 > edge_vertices{
-                    tetrahedral_solid_.polyhedron_facet_vertex( { facet, v } ),
-                    tetrahedral_solid_.polyhedron_facet_vertex(
-                        { facet, ( v + 1 ) % 3 } )
-                };
-                this->find_or_create_edge( std::move( edge_vertices ) );
-            }
-            this->find_or_create_facet( std::move( facet_vertices ) );
-        }
+        do_create_facets( vertices );
+        do_create_edges( vertices );
         return added_tetra;
     }
 
+    template < index_t dimension >
+    void TetrahedralSolidBuilder< dimension >::reserve_tetrahedra( index_t nb )
+    {
+        const auto nb_tet = tetrahedral_solid_.nb_polyhedra();
+        tetrahedral_solid_.polyhedron_attribute_manager().reserve(
+            nb_tet + nb );
+        tetrahedral_solid_.facet_attribute_manager().reserve( nb_tet + 4 * nb );
+        tetrahedral_solid_.edge_attribute_manager().reserve( nb_tet + 6 * nb );
+    }
+
     template < index_t dimension >
     index_t TetrahedralSolidBuilder< dimension >::create_tetrahedra(
         index_t nb )

diff --git a/src/geode/mesh/builder/triangulated_surface_builder.cpp b/src/geode/mesh/builder/triangulated_surface_builder.cpp
@@ -95,6 +95,15 @@ namespace geode
         return added_triangle;
     }
 
+    template < index_t dimension >
+    void TriangulatedSurfaceBuilder< dimension >::reserve_triangles(
+        index_t nb )
+    {
+        const auto nb_triangles = triangulated_surface_.nb_polygons();
+        triangulated_surface_.polygon_attribute_manager().reserve(
+            nb_triangles + nb );
+    }
+
     template < index_t dimension >
     void TriangulatedSurfaceBuilder< dimension >::copy(
         const TriangulatedSurface< dimension >& triangulated_surface )

diff --git a/src/geode/mesh/core/polyhedral_solid.cpp b/src/geode/mesh/core/polyhedral_solid.cpp
@@ -201,11 +201,7 @@ namespace geode
 
         index_t find_or_create_edge( std::array< index_t, 2 > edge_vertices )
         {
-            if( edge_vertices[0] < edge_vertices[1] )
-            {
-                return Edges::add_facet( std::move( edge_vertices ) );
-            }
-            return find_edge( edge_vertices );
+            return Edges::add_facet( std::move( edge_vertices ) );
         }
 
         const PolyhedronFacetVertices& get_facet_vertices(

diff --git a/tests/mesh/test-tetrahedral-solid.cpp b/tests/mesh/test-tetrahedral-solid.cpp
@@ -48,6 +48,9 @@ void test_create_vertices( const geode::TetrahedralSolid3D& solid,
 void test_create_tetrahedra( const geode::TetrahedralSolid3D& solid,
     geode::TetrahedralSolidBuilder3D& builder )
 {
+    builder.reserve_tetrahedra( 3 );
+    OPENGEODE_EXCEPTION( solid.nb_polyhedra() == 0,
+        "[Test] TetrahedralSolid should have no tetrahedron" );
     builder.create_tetrahedra( 1 );
     builder.create_tetrahedron( { 1, 2, 3, 4 } );
     builder.create_polyhedron( { 1, 4, 3, 5 },