Merge branch 'dev' of github.com:Geode-solutions/OpenGeode-Inspector into feat/colocalization_criterion

MelchiorSchuh · MelchiorSchuh · commit d60313187f07 · 2021-11-09T15:21:32.000+01:00
diff --git a/include/geode/inspector/criterion/private/colocalization_impl.h b/include/geode/inspector/criterion/private/colocalization_impl.h
diff --git a/include/geode/inspector/criterion/private/degeneration_impl.h b/include/geode/inspector/criterion/private/degeneration_impl.h
@@ -39,7 +39,6 @@ namespace geode
 
         public:
             DegenerationImpl( const MeshType& mesh );
-            ~DegenerationImpl();
 
             bool is_mesh_degenerated() const;
 
@@ -50,6 +49,7 @@ namespace geode
         private:
             bool edge_is_degenerated( index_t edge_index ) const;
 
+        private:
             const MeshType& mesh_;
         };
     } // namespace detail
diff --git a/src/geode/inspector/CMakeLists.txt b/src/geode/inspector/CMakeLists.txt
@@ -25,13 +25,13 @@ add_geode_library(
         "common.cpp"
         "criterion/degeneration/surface_degeneration.cpp"
         "criterion/degeneration/solid_degeneration.cpp"
-        "criterion/detail/degeneration_impl.cpp"
+        "criterion/private/degeneration_impl.cpp"
     PUBLIC_HEADERS
         "common.h"
         "criterion/degeneration/surface_degeneration.h"
         "criterion/degeneration/solid_degeneration.h"
     PRIVATE_HEADERS
-        "criterion/detail/degeneration_impl.h"
+        "criterion/private/degeneration_impl.h"
     PUBLIC_DEPENDENCIES
         OpenGeode::basic
     PRIVATE_DEPENDENCIES
diff --git a/src/geode/inspector/criterion/degeneration/solid_degeneration.cpp b/src/geode/inspector/criterion/degeneration/solid_degeneration.cpp
@@ -22,7 +22,7 @@
  */
 
 #include <geode/inspector/criterion/degeneration/solid_degeneration.h>
-#include <geode/inspector/criterion/detail/degeneration_impl.h>
+#include <geode/inspector/criterion/private/degeneration_impl.h>
 
 #include <geode/basic/pimpl_impl.h>
 
@@ -35,7 +35,7 @@ namespace geode
     {
     public:
         Impl( const SolidMesh3D& mesh )
-            : detail::DegenerationImpl< SolidMesh3D >( mesh )
+            : detail::DegenerationImpl< SolidMesh3D >{ mesh }
         {
         }
     };
diff --git a/src/geode/inspector/criterion/degeneration/surface_degeneration.cpp b/src/geode/inspector/criterion/degeneration/surface_degeneration.cpp
@@ -22,7 +22,7 @@
  */
 
 #include <geode/inspector/criterion/degeneration/surface_degeneration.h>
-#include <geode/inspector/criterion/detail/degeneration_impl.h>
+#include <geode/inspector/criterion/private/degeneration_impl.h>
 
 #include <geode/basic/pimpl_impl.h>
 
@@ -36,7 +36,7 @@ namespace geode
     {
     public:
         Impl( const SurfaceMesh< dimension >& mesh )
-            : detail::DegenerationImpl< SurfaceMesh< dimension > >( mesh )
+            : detail::DegenerationImpl< SurfaceMesh< dimension > >{ mesh }
         {
         }
     };
diff --git a/src/geode/inspector/criterion/private/colocalization_impl.cpp b/src/geode/inspector/criterion/private/colocalization_impl.cpp
diff --git a/src/geode/inspector/criterion/private/degeneration_impl.cpp b/src/geode/inspector/criterion/private/degeneration_impl.cpp
@@ -21,7 +21,7 @@
  *
  */
 
-#include <geode/inspector/criterion/detail/degeneration_impl.h>
+#include <geode/inspector/criterion/private/degeneration_impl.h>
 
 #include <geode/mesh/core/solid_edges.h>
 #include <geode/mesh/core/solid_mesh.h>
@@ -42,11 +42,6 @@ namespace geode
             mesh_.enable_edges();
         }
 
-        template < class MeshType >
-        DegenerationImpl< MeshType >::~DegenerationImpl()
-        {
-        }
-
         template < class MeshType >
         bool DegenerationImpl< MeshType >::is_mesh_degenerated() const
         {
@@ -98,10 +93,10 @@ namespace geode
         bool DegenerationImpl< MeshType >::edge_is_degenerated(
             index_t edge_index ) const
         {
-            const auto edge_vertices{ mesh_.edges().edge_vertices(
-                edge_index ) };
-            const auto p1{ mesh_.point( edge_vertices[0] ) };
-            const auto p2{ mesh_.point( edge_vertices[1] ) };
+            const auto edge_vertices =
+                mesh_.edges().edge_vertices( edge_index );
+            const auto p1 = mesh_.point( edge_vertices[0] );
+            const auto p2 = mesh_.point( edge_vertices[1] );
             return point_point_distance( p1, p2 ) < global_epsilon;
         }
 
diff --git a/tests/inspector/test-solid-degeneration.cpp b/tests/inspector/test-solid-degeneration.cpp
@@ -45,7 +45,7 @@ void check_non_degeneration()
     builder->create_tetrahedron( { 0, 1, 2, 3 } );
     builder->create_tetrahedron( { 0, 1, 2, 4 } );
 
-    geode::SolidMeshDegeneration degeneration_inspector{ *solid };
+    const geode::SolidMeshDegeneration degeneration_inspector{ *solid };
     OPENGEODE_EXCEPTION( !degeneration_inspector.is_mesh_degenerated(),
         "[Test] Solid is shown degenerated whereas it is not." );
     OPENGEODE_EXCEPTION( degeneration_inspector.nb_degenerated_edges() == 0,
@@ -69,7 +69,7 @@ void check_degeneration_by_colocalisation()
     builder->create_tetrahedron( { 0, 1, 2, 4 } );
     solid->enable_edges();
 
-    geode::SolidMeshDegeneration degeneration_inspector{ *solid };
+    const geode::SolidMeshDegeneration degeneration_inspector{ *solid };
     OPENGEODE_EXCEPTION( degeneration_inspector.is_mesh_degenerated(),
         "[Test] Solid is shown not degenerated whereas it is." );
     OPENGEODE_EXCEPTION( degeneration_inspector.nb_degenerated_edges() == 1,
@@ -93,7 +93,7 @@ void check_degeneration_by_point_multiple_presence()
     builder->create_tetrahedron( { 0, 1, 2, 1 } );
     solid->enable_edges();
 
-    geode::SolidMeshDegeneration degeneration_inspector{ *solid };
+    const geode::SolidMeshDegeneration degeneration_inspector{ *solid };
     OPENGEODE_EXCEPTION( degeneration_inspector.is_mesh_degenerated(),
         "[Test] Solid is not shown degenerated whereas it is." );
     OPENGEODE_EXCEPTION( degeneration_inspector.nb_degenerated_edges() == 1,
diff --git a/tests/inspector/test-surface-degeneration.cpp b/tests/inspector/test-surface-degeneration.cpp
@@ -44,7 +44,7 @@ void check_non_degeneration()
     builder->create_triangle( { 0, 1, 2 } );
     builder->create_triangle( { 2, 1, 3 } );
 
-    geode::SurfaceMeshDegeneration2D degeneration_inspector{ *surface };
+    const geode::SurfaceMeshDegeneration2D degeneration_inspector{ *surface };
     OPENGEODE_EXCEPTION( !degeneration_inspector.is_mesh_degenerated(),
         "[Test] Surface is shown degenerated whereas it is not." );
     OPENGEODE_EXCEPTION( degeneration_inspector.nb_degenerated_edges() == 0,
@@ -66,7 +66,7 @@ void check_degeneration_by_colocalisation()
     builder->create_triangle( { 0, 1, 2 } );
     builder->create_triangle( { 2, 1, 3 } );
 
-    geode::SurfaceMeshDegeneration2D degeneration_inspector{ *surface };
+    const geode::SurfaceMeshDegeneration2D degeneration_inspector{ *surface };
     OPENGEODE_EXCEPTION( degeneration_inspector.is_mesh_degenerated(),
         "[Test] Surface is shown not degenerated whereas it is." );
     OPENGEODE_EXCEPTION( degeneration_inspector.nb_degenerated_edges() == 1,
@@ -89,7 +89,7 @@ void check_degeneration_by_point_multiple_presence()
     builder->create_triangle( { 0, 1, 2 } );
     builder->create_triangle( { 1, 2, 1 } );
 
-    geode::SurfaceMeshDegeneration2D degeneration_inspector{ *surface };
+    const geode::SurfaceMeshDegeneration2D degeneration_inspector{ *surface };
     OPENGEODE_EXCEPTION( degeneration_inspector.is_mesh_degenerated(),
         "[Test] Surface is not shown degenerated whereas it is." );
     OPENGEODE_EXCEPTION( degeneration_inspector.nb_degenerated_edges() == 1,

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`	`*/`
`23`	`23`
`24`	`24`	`#include <geode/inspector/criterion/degeneration/solid_degeneration.h>`
`25`		`-#include <geode/inspector/criterion/detail/degeneration_impl.h>`
	`25`	`+#include <geode/inspector/criterion/private/degeneration_impl.h>`
`26`	`26`
`27`	`27`	`#include <geode/basic/pimpl_impl.h>`
`28`	`28`
`@@ -35,7 +35,7 @@ namespace geode`
`35`	`35`	`{`
`36`	`36`	`public:`
`37`	`37`	`Impl( const SolidMesh3D& mesh )`
`38`		`- : detail::DegenerationImpl< SolidMesh3D >( mesh )`
	`38`	`+ : detail::DegenerationImpl< SolidMesh3D >{ mesh }`
`39`	`39`	`{`
`40`	`40`	`}`
`41`	`41`	`};`