working version of the degeneration inspector for surfacemeshes

Author: MelchiorSchuh

include/geode/inspector/criterion/degeneration.h

@@ -44,7 +44,7 @@ namespace geode
         class opengeode_inspector_inspector_api SurfaceMeshDegeneration
         {
         public:
-            SurfaceMeshDegeneration() = default;
+            SurfaceMeshDegeneration();
             SurfaceMeshDegeneration( SurfaceMeshDegeneration&& other );
             ~SurfaceMeshDegeneration();
 

src/geode/inspector/criterion/degeneration.cpp

@@ -67,7 +67,7 @@ namespace geode
             index_t nb_degenerated_edges(
                 const SurfaceMesh< dimension >& mesh ) const
             {
-                index_t nb_degeneration;
+                index_t nb_degeneration = 0;
 
                 mesh.enable_edges();
                 for( auto edge_index : Range( mesh.edges().nb_edges() ) )
@@ -109,6 +109,11 @@ namespace geode
             }
         };
 
+        template < index_t dimension >
+        SurfaceMeshDegeneration< dimension >::SurfaceMeshDegeneration()
+        {
+        }
+
         template < index_t dimension >
         SurfaceMeshDegeneration< dimension >::~SurfaceMeshDegeneration()
         {

tests/inspector/test-degeneration.cpp

@@ -26,10 +26,13 @@
 
 #include <geode/geometry/point.h>
 #include <geode/mesh/builder/triangulated_surface_builder.h>
+#include <geode/mesh/core/surface_edges.h>
 #include <geode/mesh/core/triangulated_surface.h>
 
 #include <geode/inspector/criterion/degeneration.h>
 
+#include <iostream>
+
 void check_non_degeneration()
 {
     auto surface = geode::TriangulatedSurface2D::create();
@@ -43,22 +46,74 @@ void check_non_degeneration()
     builder->create_triangle( { 0, 1, 2 } );
     builder->create_triangle( { 2, 1, 3 } );
 
+    geode::inspector::SurfaceMeshDegeneration2D degeneration_inspector;
+    OPENGEODE_EXCEPTION(
+        !degeneration_inspector.is_mesh_degenerated( *surface ),
+        "[Test] Surface is shown degenerated whereas it is not." );
+    OPENGEODE_EXCEPTION(
+        degeneration_inspector.nb_degenerated_edges( *surface ) == 0,
+        "[Test] Surface has more degenerated edges than it should." );
+    OPENGEODE_EXCEPTION(
+        degeneration_inspector.degenerated_edges( *surface ).size() == 0,
+        "[Test] Surface has degenerated edges when it should have none." );
+}
+
+void check_degeneration_by_colocalisation()
+{
+    auto surface = geode::TriangulatedSurface2D::create();
+    auto builder = geode::TriangulatedSurfaceBuilder2D::create( *surface );
+    builder->create_vertices( 4 );
+    builder->set_point( 0, { { 0., 2. } } );
+    builder->set_point( 1, { { 2., 0. } } );
+    builder->set_point( 2, { { 1., 4. } } );
+    builder->set_point( 3, { { 2., geode::global_epsilon / 2 } } );
+
+    builder->create_triangle( { 0, 1, 2 } );
+    builder->create_triangle( { 2, 1, 3 } );
+    surface->enable_edges();
+
     geode::inspector::SurfaceMeshDegeneration2D degeneration_inspector;
     OPENGEODE_EXCEPTION( degeneration_inspector.is_mesh_degenerated( *surface ),
-        "[Test] Surface is shown degenerated whereas it is not" );
+        "[Test] Surface is shown not degenerated whereas it is." );
     OPENGEODE_EXCEPTION(
-        degeneration_inspector.nb_degenerated_edges( *surface ) != 0,
-        "[Test] Surface is shown degenerated whereas it is not" );
+        degeneration_inspector.nb_degenerated_edges( *surface ) == 1,
+        "[Test] Surface has wrong number of degenerated edges." );
+    OPENGEODE_EXCEPTION( degeneration_inspector.degenerated_edges( *surface )[0]
+                             == surface->edges().edge_from_vertices( { 1, 3 } ),
+        "[Test] Surface has wrong degenerated edges." );
+}
+
+void check_degeneration_by_point_multiple_presence()
+{
+    auto surface = geode::TriangulatedSurface2D::create();
+    auto builder = geode::TriangulatedSurfaceBuilder2D::create( *surface );
+    builder->create_vertices( 4 );
+    builder->set_point( 0, { { 0., 2. } } );
+    builder->set_point( 1, { { 2., 0. } } );
+    builder->set_point( 2, { { 1., 4. } } );
+
+    builder->create_triangle( { 0, 1, 2 } );
+    builder->create_triangle( { 1, 2, 1 } );
+    surface->enable_edges();
+
+    geode::inspector::SurfaceMeshDegeneration2D degeneration_inspector;
+    OPENGEODE_EXCEPTION( degeneration_inspector.is_mesh_degenerated( *surface ),
+        "[Test] Surface is not shown degenerated whereas it is." );
     OPENGEODE_EXCEPTION(
-        degeneration_inspector.degenerated_edges( *surface ).size() != 0,
-        "[Test] Surface is shown degenerated whereas it is not" );
+        degeneration_inspector.nb_degenerated_edges( *surface ) == 1,
+        "[Test] Surface has the wrong number of degenerated edges." );
+    OPENGEODE_EXCEPTION( degeneration_inspector.degenerated_edges( *surface )[0]
+                             == surface->edges().edge_from_vertices( { 1, 1 } ),
+        "[Test] Surface shows the wrong degenerated edges." );
 }
 
 int main()
 {
     try
     {
         check_non_degeneration();
+        check_degeneration_by_colocalisation();
+        check_degeneration_by_point_multiple_presence();
 
         geode::Logger::info( "TEST SUCCESS" );
         return 0;