Merge pull request #942 from Geode-solutions/fix/missing_cmake_includ…

…e_for_merge_mappings fix(merge_mappings): Added missing cmake include and test.
Geode-solutions · Jun 21, 2024 · 6d3bf35 · 6d3bf35
2 parents 8a5a225 + bc394c5
commit 6d3bf35
Show file tree

Hide file tree

Showing 3 changed files with 57 additions and 0 deletions.
diff --git a/src/geode/model/CMakeLists.txt b/src/geode/model/CMakeLists.txt
@@ -41,6 +41,7 @@ add_geode_library(
         "helpers/surface_radial_sort.cpp"
         "helpers/ray_tracing.cpp"
         "helpers/detail/build_model_boundaries.cpp"
+        "helpers/detail/mappings_merger.cpp"
         "helpers/detail/split_along_surface_mesh_borders.cpp"
         "helpers/detail/split_along_block_mesh_borders.cpp"
         "mixin/builder/blocks_builder.cpp"
@@ -163,6 +164,7 @@ add_geode_library(
         "representation/io/geode/geode_section_output.h"
     ADVANCED_HEADERS
         "helpers/detail/build_model_boundaries.h"
+        "helpers/detail/mappings_merger.h"
         "helpers/detail/split_along_surface_mesh_borders.h"
         "helpers/detail/split_along_block_mesh_borders.h"
         "mixin/core/detail/components_storage.h"

diff --git a/src/geode/model/helpers/detail/mappings_merger.cpp b/src/geode/model/helpers/detail/mappings_merger.cpp
@@ -274,6 +274,7 @@ namespace geode
             result.mesh_vertices_mapping.surfaces =
                 merge_vertex_mappings( mappings1.mesh_vertices_mapping.surfaces,
                     mappings2.mesh_vertices_mapping.surfaces );
+            return result;
         }
     } // namespace detail
 } // namespace geode
diff --git a/tests/model/test-model-mapping.cpp b/tests/model/test-model-mapping.cpp
@@ -24,6 +24,7 @@
 #include <geode/basic/assert.h>
 #include <geode/basic/logger.h>
 
+#include <geode/model/helpers/detail/mappings_merger.h>
 #include <geode/model/mixin/core/corner.h>
 #include <geode/model/mixin/core/line.h>
 #include <geode/model/mixin/core/surface.h>
@@ -179,6 +180,59 @@ void test_components_mapping()
     }
 }
 
+void test_merge_mappings()
+{
+    std::vector< geode::uuid > uuids_in( 3 );
+    std::vector< geode::uuid > uuids_mid( 3 );
+    std::vector< geode::uuid > uuids_out( 3 );
+
+    geode::ModelGenericMapping generic_mapping;
+    geode::GenericMapping< geode::uuid > first_mapping;
+    for( const auto i : geode::LRange{ 3 } )
+    {
+        for( const auto j : geode::Range{ i, 3 } )
+        {
+            first_mapping.map( uuids_in[i], uuids_mid[j] );
+        }
+    }
+    generic_mapping.emplace(
+        geode::Corner3D::component_type_static(), std::move( first_mapping ) );
+
+    geode::ModelCopyMapping copy_mapping;
+    geode::BijectiveMapping< geode::uuid > second_mapping;
+    for( const auto i : geode::LRange{ 3 } )
+    {
+        second_mapping.map( uuids_mid[i], uuids_out[i] );
+    }
+    copy_mapping.emplace(
+        geode::Corner3D::component_type_static(), std::move( second_mapping ) );
+
+    const auto merged_mapping =
+        geode::detail::merge_mappings( generic_mapping, copy_mapping );
+    OPENGEODE_EXCEPTION( !merged_mapping.has_mapping_type(
+                             geode::Surface3D::component_type_static() ),
+        "[Test] Generic mappings should not exist for Surfaces" );
+    OPENGEODE_EXCEPTION( generic_mapping.has_mapping_type(
+                             geode::Corner3D::component_type_static() ),
+        "[Test] Generic mappings should exist for Corners" );
+    const auto& corner_merged_mappings =
+        merged_mapping.at( geode::Corner3D::component_type_static() );
+    OPENGEODE_EXCEPTION( corner_merged_mappings.size_in() == 3,
+        "[Test] Wrong size for CopyMapping Corners in" );
+    OPENGEODE_EXCEPTION( corner_merged_mappings.size_out() == 3,
+        "[Test] Wrong size for CopyMapping Corners out" );
+    for( const auto i : geode::LRange{ 3 } )
+    {
+        OPENGEODE_EXCEPTION( corner_merged_mappings.in2out( uuids_in[i] ).size()
+                                 == static_cast< geode::index_t >( 3 - i ),
+            "[Test] Wrong mapping for CopyMapping Corners (in2out)" );
+        OPENGEODE_EXCEPTION(
+            corner_merged_mappings.out2in( uuids_out[i] ).size()
+                == static_cast< geode::index_t >( i + 1 ),
+            "[Test] Wrong mapping for CopyMapping Corners (out2in)" );
+    }
+}
+
 void test()
 {
     test_copy_mapping();