Merge pull request #149 from Geode-solutions/fix/added_queries_for_horizon_conformity

fix(HorizonsStack): Added queries to know if a stratigraphic componen…

Author: MelchiorSchuh

include/geode/geosciences/implicit/mixin/core/stratigraphic_relationships.hpp

@@ -63,6 +63,10 @@ namespace geode
 
         [[nodiscard]] std::optional< uuid > under( const uuid& element ) const;
 
+        [[nodiscard]] bool is_conformal_above( const uuid& element ) const;
+
+        [[nodiscard]] bool is_conformal_under( const uuid& element ) const;
+
         void save_stratigraphic_relationships(
             std::string_view directory ) const;
 

include/geode/geosciences/implicit/representation/core/detail/helpers.hpp

@@ -105,6 +105,11 @@ namespace geode
             const HorizonsStack< dimension >& horizon_stack,
             std::string_view horizon_name );
 
+        template < index_t dimension >
+        [[nodiscard]] std::optional< uuid > stratigraphic_unit_id_from_name(
+            const HorizonsStack< dimension >& horizon_stack,
+            std::string_view unit_name );
+
         [[nodiscard]] std::vector< MeshElement >
             opengeode_geosciences_implicit_api invalid_stratigraphic_tetrahedra(
                 const StratigraphicModel& model );

include/geode/geosciences/implicit/representation/core/horizons_stack.hpp

@@ -169,6 +169,8 @@ namespace geode
         [[nodiscard]] bool is_baselap_of( const Horizon< dimension >& baselap,
             const StratigraphicUnit< dimension >& baselap_top ) const;
 
+        [[nodiscard]] std::string string() const;
+
     public:
         void compute_top_and_bottom_horizons( HorizonsStackBuilderKey key );
 

src/geode/geosciences/implicit/mixin/core/stratigraphic_relationships.cpp

@@ -160,6 +160,56 @@ namespace geode
             return std::nullopt;
         }
 
+        bool is_conformal_above( const uuid& element ) const
+        {
+            const auto index_from = vertex_id( element );
+            OPENGEODE_EXCEPTION( index_from,
+                "[StratigraphicRelationships::Impl::is_conformal_"
+                "above] Did not find element id in relations graph. Element "
+                "with id ",
+                element.string(), "probably doesn't exist." );
+            for( const auto& edge_vertex :
+                this->graph().edges_around_vertex( index_from.value() ) )
+            {
+                if( !above_relations_->value( edge_vertex.edge_id ) )
+                {
+                    continue;
+                }
+                if( edge_vertex.vertex_id == UNDER_EDGE_VERTEX )
+                {
+                    return unconformity_relations_->value( edge_vertex.edge_id )
+                           == NO_UNCONFORMITY;
+                }
+            }
+            geode::Logger::debug( "Didn't find any relation leading to above" );
+            return true;
+        }
+
+        bool is_conformal_under( const uuid& element ) const
+        {
+            const auto index_from = vertex_id( element );
+            OPENGEODE_EXCEPTION( index_from,
+                "[StratigraphicRelationships::Impl::is_conformal_"
+                "under] Did not find element id in relations graph. Element "
+                "with id ",
+                element.string(), "probably doesn't exist." );
+            for( const auto& edge_vertex :
+                this->graph().edges_around_vertex( index_from.value() ) )
+            {
+                if( !above_relations_->value( edge_vertex.edge_id ) )
+                {
+                    continue;
+                }
+                if( edge_vertex.vertex_id == ABOVE_EDGE_VERTEX )
+                {
+                    return unconformity_relations_->value( edge_vertex.edge_id )
+                           == NO_UNCONFORMITY;
+                }
+            }
+            geode::Logger::debug( "Didn't find any relation leading to under" );
+            return true;
+        }
+
         index_t add_above_relation(
             const ComponentID& above, const ComponentID& under )
         {
@@ -182,6 +232,9 @@ namespace geode
                     id.value(), EROSION_RELATION );
                 return id.value();
             }
+            geode::Logger::trace( "Found no edge between erosion ",
+                erosion.string(), " and eroded ", eroded.string(),
+                ", creating a new one" );
             const auto index = add_relation_edge( erosion, eroded );
             unconformity_relations_->set_value( index, EROSION_RELATION );
             return index;
@@ -197,6 +250,9 @@ namespace geode
                     id.value(), BASELAP_RELATION );
                 return id.value();
             }
+            geode::Logger::trace( "Found no edge between baselap_top ",
+                baselap_top.string(), " and baselap ", baselap.string(),
+                ", creating a new one" );
             const auto index = add_relation_edge( baselap_top, baselap );
             unconformity_relations_->set_value( index, BASELAP_RELATION );
             return index;
@@ -389,6 +445,18 @@ namespace geode
         return impl_->under( element );
     }
 
+    bool StratigraphicRelationships::is_conformal_above(
+        const uuid& element ) const
+    {
+        return impl_->is_conformal_above( element );
+    }
+
+    bool StratigraphicRelationships::is_conformal_under(
+        const uuid& element ) const
+    {
+        return impl_->is_conformal_under( element );
+    }
+
     index_t StratigraphicRelationships::add_above_relation(
         const ComponentID& above,
         const ComponentID& under,

src/geode/geosciences/implicit/representation/core/detail/helpers.cpp

@@ -386,6 +386,21 @@ namespace geode
             return std::nullopt;
         }
 
+        template < index_t dimension >
+        std::optional< uuid > stratigraphic_unit_id_from_name(
+            const HorizonsStack< dimension >& horizon_stack,
+            absl::string_view unit_name )
+        {
+            for( const auto& unit : horizon_stack.stratigraphic_units() )
+            {
+                if( unit.name() == unit_name )
+                {
+                    return unit.id();
+                }
+            }
+            return std::nullopt;
+        }
+
         std::vector< MeshElement > invalid_stratigraphic_tetrahedra(
             const StratigraphicModel& implicit_model )
         {
@@ -449,5 +464,9 @@ namespace geode
         template std::optional< uuid >
             opengeode_geosciences_implicit_api horizon_id_from_name< 3 >(
                 const HorizonsStack< 3 >&, absl::string_view );
+        template std::optional< uuid > stratigraphic_unit_id_from_name< 2 >(
+            const HorizonsStack< 2 >&, absl::string_view );
+        template std::optional< uuid > stratigraphic_unit_id_from_name< 3 >(
+            const HorizonsStack< 3 >&, absl::string_view );
     } // namespace detail
 } // namespace geode

src/geode/geosciences/implicit/representation/core/horizons_stack.cpp

@@ -181,6 +181,35 @@ namespace geode
             baselap.id(), baselap_top.id() );
     }
 
+    template < index_t dimension >
+    std::string HorizonsStack< dimension >::string() const
+    {
+        auto result = absl::StrCat(
+            "HorizonsStack ", this->name(), " from top to bottom:" );
+        const auto& top_unit = this->stratigraphic_unit(
+            this->above( this->top_horizon().value() ).value() );
+        absl::StrAppend( &result, "\n", top_unit.component_id().string(),
+            ", named ", top_unit.name() );
+        for( const auto& horizon : this->top_to_bottom_horizons() )
+        {
+            if( !this->is_conformal_above( horizon.id() ) )
+            {
+                absl::StrAppend( &result, "\n Unconformal above" );
+            }
+            absl::StrAppend( &result, "\n---", horizon.component_id().string(),
+                ", named ", horizon.name() );
+            if( !this->is_conformal_under( horizon.id() ) )
+            {
+                absl::StrAppend( &result, "\n Unconformal under" );
+            }
+            const auto& under_unit =
+                this->stratigraphic_unit( this->under( horizon.id() ).value() );
+            absl::StrAppend( &result, "\n", under_unit.component_id().string(),
+                ", named ", under_unit.name() );
+        }
+        return result;
+    }
+
     template < index_t dimension >
     void HorizonsStack< dimension >::compute_top_and_bottom_horizons(
         HorizonsStackBuilderKey /*unused*/ )