VoxelGraphCut: in sub-tasks allocate smaller bit-sets (#1191)

MeshInspector · Apr 28, 2023 · 8becf8d · 8becf8d
1 parent 7ecf070
commit 8becf8d
Show file tree

Hide file tree

Showing 3 changed files with 134 additions and 81 deletions.
diff --git a/source/MRMesh/MRBitSet.cpp b/source/MRMesh/MRBitSet.cpp
@@ -36,6 +36,15 @@ BitSet & BitSet::operator -= ( const BitSet & rhs )
     return *this;
 }
 
+BitSet & BitSet::subtract( const BitSet & b, int bShiftInBlocks )
+{
+    const auto beginBlock = std::max( 0, bShiftInBlocks );
+    const auto endBlock = std::clamp( b.num_blocks() + bShiftInBlocks, size_t(0), num_blocks() );
+    for ( size_type i = beginBlock; i < endBlock; ++i )
+        m_bits[i] &= ~b.m_bits[i - bShiftInBlocks];
+    return *this;
+}
+
 bool operator == ( const BitSet & a, const BitSet & b )
 {
     if ( a.size() == b.size() )

diff --git a/source/MRMesh/MRBitSet.h b/source/MRMesh/MRBitSet.h
@@ -34,6 +34,8 @@ class BitSet : public boost::dynamic_bitset<std::uint64_t>
     MRMESH_API BitSet & operator |= ( const BitSet & b );
     MRMESH_API BitSet & operator ^= ( const BitSet & b );
     MRMESH_API BitSet & operator -= ( const BitSet & b );
+    /// subtracts b from this, considering that bits in b are shifted right on bShiftInBlocks*bits_per_block
+    MRMESH_API BitSet & subtract( const BitSet & b, int bShiftInBlocks );
 
     /// return the highest index i such as bit i is set, or npos if *this has no on bits. 
     [[nodiscard]] MRMESH_API IndexType find_last() const;
@@ -109,6 +111,8 @@ class TaggedBitSet : public BitSet
     TaggedBitSet & operator |= ( const TaggedBitSet & b ) { base::operator |= ( b ); return * this; }
     TaggedBitSet & operator ^= ( const TaggedBitSet & b ) { base::operator ^= ( b ); return * this; }
     TaggedBitSet & operator -= ( const TaggedBitSet & b ) { base::operator -= ( b ); return * this; }
+    /// subtracts b from this, considering that bits in b are shifted right on bShiftInBlocks*bits_per_block
+    TaggedBitSet & subtract( const TaggedBitSet & b, int bShiftInBlocks ) { base::subtract( b, bShiftInBlocks ); return * this; }
 
     void autoResizeSet( IndexType pos, size_type len, bool val = true ) { base::autoResizeSet( pos, len, val ); }
     void autoResizeSet( IndexType pos, bool val = true ) { base::autoResizeSet( pos, val ); }