Merge branch 'v15' of github.com:Geode-solutions/OpenGeode-Inspector …

…into fix/explicit_keyword_on_point_and_vector
Geode-solutions · Jul 8, 2024 · 70ad21d · 70ad21d
2 parents df48bd0 + c120967
commit 70ad21d
Show file tree

Hide file tree

Showing 16 changed files with 112 additions and 104 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,5 +1,5 @@
 {
-    "C_Cpp.default.cppStandard": "c++11",
+    "C_Cpp.default.cppStandard": "c++17",
     "C_Cpp.default.includePath": [
         "${workspaceFolder}/include",
         "${workspaceFolder}/build",

diff --git a/bindings/python/requirements.txt b/bindings/python/requirements.txt
@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile with Python 3.10
 # by the following command:
 #
-#    pip-compile bindings/python/requirements.in
+#    pip-compile --pre bindings/python/requirements.in
 #
-opengeode-core==14.*,>=14.24.3
+opengeode-core==14.*,>=14.25.2rc2
     # via -r bindings/python/requirements.in
diff --git a/include/geode/inspector/topology/brep_blocks_topology.h b/include/geode/inspector/topology/brep_blocks_topology.h
@@ -23,12 +23,11 @@
 
 #pragma once
 
+#include <optional>
 #include <string>
 #include <utility>
 #include <vector>
 
-#include <absl/types/optional.h>
-
 #include <geode/basic/uuid.h>
 
 #include <geode/inspector/common.h>
@@ -77,11 +76,11 @@ namespace geode
 
         bool brep_blocks_topology_is_valid( index_t unique_vertex_index ) const;
 
-        absl::optional< std::string >
+        std::optional< std::string >
             unique_vertex_is_part_of_two_blocks_and_no_boundary_surface(
                 index_t unique_vertex_index ) const;
 
-        absl::optional< std::string >
+        std::optional< std::string >
             unique_vertex_block_cmvs_count_is_incorrect(
                 index_t unique_vertex_index ) const;
 

diff --git a/include/geode/inspector/topology/brep_corners_topology.h b/include/geode/inspector/topology/brep_corners_topology.h
@@ -23,10 +23,9 @@
 
 #pragma once
 
+#include <optional>
 #include <string>
 
-#include <absl/types/optional.h>
-
 #include <geode/basic/uuid.h>
 
 #include <geode/inspector/common.h>
@@ -86,16 +85,16 @@ namespace geode
          */
         bool brep_corner_topology_is_valid( index_t unique_vertex_index ) const;
 
-        absl::optional< std::string > unique_vertex_has_multiple_corners(
+        std::optional< std::string > unique_vertex_has_multiple_corners(
             index_t unique_vertex_index ) const;
 
-        absl::optional< std::string > corner_has_multiple_embeddings(
+        std::optional< std::string > corner_has_multiple_embeddings(
             index_t unique_vertex_index ) const;
 
-        absl::optional< std::string > corner_is_not_internal_nor_boundary(
+        std::optional< std::string > corner_is_not_internal_nor_boundary(
             index_t unique_vertex_index ) const;
 
-        absl::optional< std::string > corner_is_part_of_line_but_not_boundary(
+        std::optional< std::string > corner_is_part_of_line_but_not_boundary(
             index_t unique_vertex_index ) const;
 
         BRepCornersTopologyInspectionResult inspect_corners_topology() const;

diff --git a/include/geode/inspector/topology/brep_lines_topology.h b/include/geode/inspector/topology/brep_lines_topology.h
@@ -22,10 +22,9 @@
  */
 
 #pragma once
+#include <optional>
 #include <string>
 
-#include <absl/types/optional.h>
-
 #include <geode/basic/uuid.h>
 
 #include <geode/inspector/common.h>
@@ -93,17 +92,17 @@ namespace geode
          */
         bool brep_lines_topology_is_valid( index_t unique_vertex_index ) const;
 
-        absl::optional< std::string >
+        std::optional< std::string >
             vertex_is_part_of_not_internal_nor_boundary_line(
                 index_t unique_vertex_index ) const;
 
-        absl::optional< std::string > vertex_is_part_of_invalid_embedded_line(
+        std::optional< std::string > vertex_is_part_of_invalid_embedded_line(
             index_t unique_vertex_index ) const;
 
-        absl::optional< std::string > vertex_is_part_of_invalid_single_line(
+        std::optional< std::string > vertex_is_part_of_invalid_single_line(
             index_t unique_vertex_index ) const;
 
-        absl::optional< std::string > vertex_has_lines_but_is_not_a_corner(
+        std::optional< std::string > vertex_has_lines_but_is_not_a_corner(
             index_t unique_vertex_index ) const;
 
         BRepLinesTopologyInspectionResult inspect_lines_topology() const;

diff --git a/include/geode/inspector/topology/brep_surfaces_topology.h b/include/geode/inspector/topology/brep_surfaces_topology.h
@@ -22,7 +22,7 @@
  */
 
 #pragma once
-#include <absl/types/optional.h>
+#include <optional>
 
 #include <geode/inspector/common.h>
 #include <geode/inspector/information.h>
@@ -103,22 +103,21 @@ namespace geode
         bool brep_surfaces_topology_is_valid(
             index_t unique_vertex_index ) const;
 
-        absl::optional< std::string >
+        std::optional< std::string >
             vertex_is_part_of_not_internal_nor_boundary_surface(
                 index_t unique_vertex_index ) const;
 
-        absl::optional< std::string >
-            vertex_is_part_of_invalid_embedded_surface(
-                index_t unique_vertex_index ) const;
+        std::optional< std::string > vertex_is_part_of_invalid_embedded_surface(
+            index_t unique_vertex_index ) const;
 
-        absl::optional< std::string > vertex_is_part_of_invalid_single_surface(
+        std::optional< std::string > vertex_is_part_of_invalid_single_surface(
             index_t unique_vertex_index ) const;
 
-        absl::optional< std::string >
+        std::optional< std::string >
             vertex_is_part_of_invalid_multiple_surfaces(
                 index_t unique_vertex_index ) const;
 
-        absl::optional< std::string >
+        std::optional< std::string >
             vertex_is_part_of_line_and_not_on_surface_border(
                 index_t unique_vertex_index ) const;
 

diff --git a/include/geode/inspector/topology/section_corners_topology.h b/include/geode/inspector/topology/section_corners_topology.h
@@ -22,10 +22,9 @@
  */
 
 #pragma once
+#include <optional>
 #include <string>
 
-#include <absl/types/optional.h>
-
 #include <geode/basic/uuid.h>
 
 #include <geode/inspector/common.h>
@@ -87,16 +86,16 @@ namespace geode
         bool section_corner_topology_is_valid(
             index_t unique_vertex_index ) const;
 
-        absl::optional< std::string > unique_vertex_has_multiple_corners(
+        std::optional< std::string > unique_vertex_has_multiple_corners(
             index_t unique_vertex_index ) const;
 
-        absl::optional< std::string > corner_has_multiple_embeddings(
+        std::optional< std::string > corner_has_multiple_embeddings(
             index_t unique_vertex_index ) const;
 
-        absl::optional< std::string > corner_is_not_internal_nor_boundary(
+        std::optional< std::string > corner_is_not_internal_nor_boundary(
             index_t unique_vertex_index ) const;
 
-        absl::optional< std::string > corner_is_part_of_line_but_not_boundary(
+        std::optional< std::string > corner_is_part_of_line_but_not_boundary(
             index_t unique_vertex_index ) const;
 
         SectionCornersTopologyInspectionResult inspect_corners_topology() const;

diff --git a/include/geode/inspector/topology/section_lines_topology.h b/include/geode/inspector/topology/section_lines_topology.h
@@ -21,7 +21,7 @@
  *
  */
 #pragma once
-#include <absl/types/optional.h>
+#include <optional>
 
 #include <geode/basic/uuid.h>
 
@@ -93,17 +93,17 @@ namespace geode
         bool section_lines_topology_is_valid(
             index_t unique_vertex_index ) const;
 
-        absl::optional< std::string >
+        std::optional< std::string >
             vertex_is_part_of_not_internal_nor_boundary_line(
                 const index_t unique_vertex_index ) const;
 
-        absl::optional< std::string > vertex_is_part_of_invalid_embedded_line(
+        std::optional< std::string > vertex_is_part_of_invalid_embedded_line(
             const index_t unique_vertex_index ) const;
 
-        absl::optional< std::string > vertex_is_part_of_invalid_single_line(
+        std::optional< std::string > vertex_is_part_of_invalid_single_line(
             index_t unique_vertex_index ) const;
 
-        absl::optional< std::string > vertex_has_lines_but_is_not_a_corner(
+        std::optional< std::string > vertex_has_lines_but_is_not_a_corner(
             index_t unique_vertex_index ) const;
 
         SectionLinesTopologyInspectionResult inspect_lines_topology() const;

diff --git a/include/geode/inspector/topology/section_surfaces_topology.h b/include/geode/inspector/topology/section_surfaces_topology.h
@@ -22,7 +22,7 @@
  */
 
 #pragma once
-#include <absl/types/optional.h>
+#include <optional>
 
 #include <geode/basic/uuid.h>
 
@@ -78,11 +78,10 @@ namespace geode
         bool section_vertex_surfaces_topology_is_valid(
             index_t unique_vertex_index ) const;
 
-        absl::optional< std::string >
-            vertex_is_part_of_invalid_embedded_surface(
-                index_t unique_vertex_index ) const;
+        std::optional< std::string > vertex_is_part_of_invalid_embedded_surface(
+            index_t unique_vertex_index ) const;
 
-        absl::optional< std::string >
+        std::optional< std::string >
             vertex_is_part_of_line_and_not_on_surface_border(
                 index_t unique_vertex_index ) const;
 

diff --git a/src/geode/inspector/topology/brep_blocks_topology.cpp b/src/geode/inspector/topology/brep_blocks_topology.cpp
@@ -23,6 +23,8 @@
 
 #include <geode/inspector/topology/brep_blocks_topology.h>
 
+#include <optional>
+
 #include <absl/container/flat_hash_set.h>
 
 #include <geode/basic/algorithm.h>
@@ -113,15 +115,15 @@ namespace geode
                       unique_vertex_index ) );
     }
 
-    absl::optional< std::string > BRepBlocksTopology::
+    std::optional< std::string > BRepBlocksTopology::
         unique_vertex_is_part_of_two_blocks_and_no_boundary_surface(
             index_t unique_vertex_index ) const
     {
         const auto block_uuids = detail::components_uuids(
             brep_, unique_vertex_index, Block3D::component_type_static() );
         if( block_uuids.size() != 2 )
         {
-            return absl::nullopt;
+            return std::nullopt;
         }
         for( const auto& surface_cmv :
             brep_.component_mesh_vertices( unique_vertex_index ) )
@@ -136,7 +138,7 @@ namespace geode
                 && brep_.Relationships::is_boundary(
                     surface_cmv.component_id.id(), block_uuids[1] ) )
             {
-                return absl::nullopt;
+                return std::nullopt;
             }
             for( const auto& line_cmv :
                 brep_.component_mesh_vertices( unique_vertex_index ) )
@@ -154,7 +156,7 @@ namespace geode
                          || brep_.Relationships::is_boundary(
                              surface_cmv.component_id.id(), block_uuids[1] ) ) )
                 {
-                    return absl::nullopt;
+                    return std::nullopt;
                 }
             }
         }
@@ -164,7 +166,7 @@ namespace geode
             "surfaces." );
     }
 
-    absl::optional< std::string >
+    std::optional< std::string >
         BRepBlocksTopology::unique_vertex_block_cmvs_count_is_incorrect(
             index_t unique_vertex_index ) const
     {
@@ -324,7 +326,7 @@ namespace geode
                     " block CMVs (should be ", predicted_nb_block_cmvs, ")." );
             }
         }
-        return absl::nullopt;
+        return std::nullopt;
     }
 
     BRepBlocksTopologyInspectionResult

diff --git a/src/geode/inspector/topology/brep_corners_topology.cpp b/src/geode/inspector/topology/brep_corners_topology.cpp
@@ -24,6 +24,8 @@
 #include <geode/inspector/topology/brep_corners_topology.h>
 #include <geode/inspector/topology/private/topology_helpers.h>
 
+#include <optional>
+
 #include <geode/mesh/core/point_set.h>
 
 #include <geode/model/mixin/core/corner.h>
@@ -127,7 +129,7 @@ namespace geode
         return true;
     }
 
-    absl::optional< std::string >
+    std::optional< std::string >
         BRepCornersTopology::unique_vertex_has_multiple_corners(
             index_t unique_vertex_index ) const
     {
@@ -145,10 +147,10 @@ namespace geode
                 corner_found = true;
             }
         }
-        return absl::nullopt;
+        return std::nullopt;
     }
 
-    absl::optional< std::string >
+    std::optional< std::string >
         BRepCornersTopology::corner_has_multiple_embeddings(
             index_t unique_vertex_index ) const
     {
@@ -164,10 +166,10 @@ namespace geode
                     "', which has several embeddings." );
             }
         }
-        return absl::nullopt;
+        return std::nullopt;
     }
 
-    absl::optional< std::string >
+    std::optional< std::string >
         BRepCornersTopology::corner_is_not_internal_nor_boundary(
             index_t unique_vertex_index ) const
     {
@@ -184,10 +186,10 @@ namespace geode
                     "', which is neither internal nor boundary." );
             }
         }
-        return absl::nullopt;
+        return std::nullopt;
     }
 
-    absl::optional< std::string >
+    std::optional< std::string >
         BRepCornersTopology::corner_is_part_of_line_but_not_boundary(
             index_t unique_vertex_index ) const
     {
@@ -246,7 +248,7 @@ namespace geode
                     "', but is neither boundary nor internal of it." );
             }
         }
-        return absl::nullopt;
+        return std::nullopt;
     }
 
     BRepCornersTopologyInspectionResult