feat(Component): add active component status

Author: BotellaA

include/geode/geosciences/explicit/mixin/core/fault_blocks.hpp

@@ -58,6 +58,8 @@ namespace geode
 
             void operator++();
 
+            void set_active_only();
+
         protected:
             FaultBlockRangeBase( const FaultBlocks& fault_blocks );
             FaultBlockRangeBase( FaultBlockRangeBase&& other ) noexcept;
@@ -91,13 +93,17 @@ namespace geode
 
         [[nodiscard]] index_t nb_fault_blocks() const;
 
+        [[nodiscard]] index_t nb_active_fault_blocks() const;
+
         [[nodiscard]] bool has_fault_block( const uuid& id ) const;
 
         [[nodiscard]] const FaultBlock< dimension >& fault_block(
             const uuid& id ) const;
 
         [[nodiscard]] FaultBlockRange fault_blocks() const;
 
+        [[nodiscard]] FaultBlockRange active_fault_blocks() const;
+
         [[nodiscard]] FaultBlockRange components() const
         {
             return fault_blocks();

include/geode/geosciences/explicit/mixin/core/faults.hpp

@@ -58,6 +58,8 @@ namespace geode
 
             void operator++();
 
+            void set_active_only();
+
         protected:
             FaultRangeBase( const Faults& faults );
             FaultRangeBase( FaultRangeBase&& other ) noexcept;
@@ -91,12 +93,16 @@ namespace geode
 
         [[nodiscard]] index_t nb_faults() const;
 
+        [[nodiscard]] index_t nb_active_faults() const;
+
         [[nodiscard]] bool has_fault( const uuid& id ) const;
 
         [[nodiscard]] const Fault< dimension >& fault( const uuid& id ) const;
 
         [[nodiscard]] FaultRange faults() const;
 
+        [[nodiscard]] FaultRange active_faults() const;
+
         [[nodiscard]] FaultRange components() const
         {
             return faults();

include/geode/geosciences/explicit/mixin/core/horizons.hpp

@@ -58,6 +58,8 @@ namespace geode
 
             void operator++();
 
+            void set_active_only();
+
         protected:
             HorizonRangeBase( const Horizons& horizons );
             HorizonRangeBase( HorizonRangeBase&& other ) noexcept;
@@ -91,13 +93,17 @@ namespace geode
 
         [[nodiscard]] index_t nb_horizons() const;
 
+        [[nodiscard]] index_t nb_active_horizons() const;
+
         [[nodiscard]] bool has_horizon( const uuid& id ) const;
 
         [[nodiscard]] const Horizon< dimension >& horizon(
             const uuid& id ) const;
 
         [[nodiscard]] HorizonRange horizons() const;
 
+        [[nodiscard]] HorizonRange active_horizons() const;
+
         [[nodiscard]] HorizonRange components() const
         {
             return horizons();

include/geode/geosciences/explicit/mixin/core/stratigraphic_units.hpp

@@ -59,6 +59,8 @@ namespace geode
 
             void operator++();
 
+            void set_active_only();
+
         protected:
             StratigraphicUnitRangeBase(
                 const StratigraphicUnits& stratigraphic_units );
@@ -97,13 +99,17 @@ namespace geode
 
         [[nodiscard]] index_t nb_stratigraphic_units() const;
 
+        [[nodiscard]] index_t nb_active_stratigraphic_units() const;
+
         [[nodiscard]] bool has_stratigraphic_unit( const uuid& id ) const;
 
         [[nodiscard]] const StratigraphicUnit< dimension >& stratigraphic_unit(
             const uuid& id ) const;
 
         [[nodiscard]] StratigraphicUnitRange stratigraphic_units() const;
 
+        [[nodiscard]] StratigraphicUnitRange active_stratigraphic_units() const;
+
         [[nodiscard]] StratigraphicUnitRange components() const
         {
             return stratigraphic_units();

src/geode/geosciences/explicit/mixin/core/fault_blocks.cpp

@@ -23,6 +23,7 @@
 
 #include <geode/geosciences/explicit/mixin/core/fault_blocks.hpp>
 
+#include <geode/basic/detail/count_range_elements.hpp>
 #include <geode/basic/identifier_builder.hpp>
 #include <geode/basic/pimpl_impl.hpp>
 #include <geode/basic/range.hpp>
@@ -58,6 +59,12 @@ namespace geode
         return impl_->nb_components();
     }
 
+    template < index_t dimension >
+    index_t FaultBlocks< dimension >::nb_active_fault_blocks() const
+    {
+        return detail::count_range_elements( active_fault_blocks() );
+    }
+
     template < index_t dimension >
     bool FaultBlocks< dimension >::has_fault_block( const uuid& id ) const
     {
@@ -93,16 +100,23 @@ namespace geode
     }
 
     template < index_t dimension >
-    typename FaultBlocks< dimension >::FaultBlockRange
-        FaultBlocks< dimension >::fault_blocks() const
+    auto FaultBlocks< dimension >::fault_blocks() const -> FaultBlockRange
     {
         return { *this };
     }
 
     template < index_t dimension >
-    typename FaultBlocks< dimension >::ModifiableFaultBlockRange
-        FaultBlocks< dimension >::modifiable_fault_blocks(
-            FaultBlocksBuilderKey /*unused*/ )
+    auto FaultBlocks< dimension >::active_fault_blocks() const
+        -> FaultBlockRange
+    {
+        FaultBlockRange range{ *this };
+        range.set_active_only();
+        return range;
+    }
+
+    template < index_t dimension >
+    auto FaultBlocks< dimension >::modifiable_fault_blocks(
+        FaultBlocksBuilderKey /*unused*/ ) -> ModifiableFaultBlockRange
     {
         return { *this };
     }
@@ -156,6 +170,31 @@ namespace geode
         {
             return *this->current()->second;
         }
+
+        void set_active_only()
+        {
+            active_only_ = true;
+            next_fault_block();
+        }
+
+        void next()
+        {
+            this->operator++();
+            next_fault_block();
+        }
+
+    private:
+        void next_fault_block()
+        {
+            while( this->operator!=( *this )
+                   && ( active_only_ && !fault_block().is_active() ) )
+            {
+                this->operator++();
+            }
+        }
+
+    private:
+        bool active_only_{ false };
     };
 
     template < index_t dimension >
@@ -187,10 +226,16 @@ namespace geode
         return impl_->operator!=( *impl_ );
     }
 
+    template < index_t dimension >
+    void FaultBlocks< dimension >::FaultBlockRangeBase::set_active_only()
+    {
+        impl_->set_active_only();
+    }
+
     template < index_t dimension >
     void FaultBlocks< dimension >::FaultBlockRangeBase::operator++()
     {
-        return impl_->operator++();
+        return impl_->next();
     }
 
     template < index_t dimension >

src/geode/geosciences/explicit/mixin/core/faults.cpp

@@ -23,6 +23,7 @@
 
 #include <geode/geosciences/explicit/mixin/core/faults.hpp>
 
+#include <geode/basic/detail/count_range_elements.hpp>
 #include <geode/basic/identifier_builder.hpp>
 #include <geode/basic/pimpl_impl.hpp>
 #include <geode/basic/range.hpp>
@@ -58,6 +59,12 @@ namespace geode
         return impl_->nb_components();
     }
 
+    template < index_t dimension >
+    index_t Faults< dimension >::nb_active_faults() const
+    {
+        return detail::count_range_elements( active_faults() );
+    }
+
     template < index_t dimension >
     bool Faults< dimension >::has_fault( const uuid& id ) const
     {
@@ -91,14 +98,22 @@ namespace geode
     }
 
     template < index_t dimension >
-    typename Faults< dimension >::FaultRange Faults< dimension >::faults() const
+    auto Faults< dimension >::faults() const -> FaultRange
     {
         return { *this };
     }
 
     template < index_t dimension >
-    typename Faults< dimension >::ModifiableFaultRange
-        Faults< dimension >::modifiable_faults( FaultsBuilderKey /*unused*/ )
+    auto Faults< dimension >::active_faults() const -> FaultRange
+    {
+        FaultRange range{ *this };
+        range.set_active_only();
+        return range;
+    }
+
+    template < index_t dimension >
+    auto Faults< dimension >::modifiable_faults( FaultsBuilderKey /*unused*/ )
+        -> ModifiableFaultRange
     {
         return { *this };
     }
@@ -175,6 +190,31 @@ namespace geode
         {
             return *this->current()->second;
         }
+
+        void set_active_only()
+        {
+            active_only_ = true;
+            next_fault();
+        }
+
+        void next()
+        {
+            this->operator++();
+            next_fault();
+        }
+
+    private:
+        void next_fault()
+        {
+            while( this->operator!=( *this )
+                   && ( active_only_ && !fault().is_active() ) )
+            {
+                this->operator++();
+            }
+        }
+
+    private:
+        bool active_only_{ false };
     };
 
     template < index_t dimension >
@@ -204,10 +244,16 @@ namespace geode
         return impl_->operator!=( *impl_ );
     }
 
+        template < index_t dimension >
+    void Faults< dimension >::FaultRangeBase::set_active_only()
+    {
+        impl_->set_active_only();
+    }
+
     template < index_t dimension >
     void Faults< dimension >::FaultRangeBase::operator++()
     {
-        return impl_->operator++();
+        return impl_->next();
     }
 
     template < index_t dimension >