diff options
| -rw-r--r-- | include/chilbert/BoundedBitVec.hpp | 40 | ||||
| -rw-r--r-- | include/chilbert/StaticBitVec.hpp | 35 | ||||
| -rw-r--r-- | include/chilbert/chilbert.ipp | 6 |
3 files changed, 18 insertions, 63 deletions
diff --git a/include/chilbert/BoundedBitVec.hpp b/include/chilbert/BoundedBitVec.hpp index cae6031..d0d9aa9 100644 --- a/include/chilbert/BoundedBitVec.hpp +++ b/include/chilbert/BoundedBitVec.hpp @@ -54,46 +54,22 @@ public: /// Return a reference to the `index`th rack #ifndef NDEBUG - const auto& rack(const size_t index) const - { - return m_racks.at(index); - } - auto& rack(const size_t index) - { - return m_racks.at(index); - } + const auto& rack(const size_t index) const { return m_racks.at(index); } + auto& rack(const size_t index) { return m_racks.at(index); } #else - const auto& rack(const size_t index) const - { - return m_racks[index]; - } - auto& rack(const size_t index) - { - return m_racks[index]; - } + const auto& rack(const size_t index) const { return m_racks[index]; } + auto& rack(const size_t index) { return m_racks[index]; } #endif /// Return a raw pointer to the racks - Rack* data() - { - return m_racks.data(); - } - const Rack* data() const - { - return m_racks.data(); - } + Rack* data() { return m_racks.data(); } + const Rack* data() const { return m_racks.data(); } /// Return the total size of all racks in bytes - size_t data_size() const - { - return num_racks() * sizeof(Rack); - } + size_t data_size() const { return num_racks() * sizeof(Rack); } /// Return the number of racks - size_t num_racks() const - { - return calculate_num_racks(m_size); - } + size_t num_racks() const { return calculate_num_racks(m_size); } private: static constexpr size_t calculate_num_racks(const size_t bits) diff --git a/include/chilbert/StaticBitVec.hpp b/include/chilbert/StaticBitVec.hpp index acfe8a1..3039cff 100644 --- a/include/chilbert/StaticBitVec.hpp +++ b/include/chilbert/StaticBitVec.hpp @@ -57,40 +57,19 @@ public: /// Return a reference to the `index`th rack #ifndef NDEBUG - const auto& rack(const size_t index) const - { - return m_racks.at(index); - } - auto& rack(const size_t index) - { - return m_racks.at(index); - } + const auto& rack(const size_t index) const { return m_racks.at(index); } + auto& rack(const size_t index) { return m_racks.at(index); } #else - const auto& rack(const size_t index) const - { - return m_racks[index]; - } - auto& rack(const size_t index) - { - return m_racks[index]; - } + const auto& rack(const size_t index) const { return m_racks[index]; } + auto& rack(const size_t index) { return m_racks[index]; } #endif /// Return a raw pointer to the racks - Rack* data() - { - return m_racks.data(); - } - const Rack* data() const - { - return m_racks.data(); - } + Rack* data() { return m_racks.data(); } + const Rack* data() const { return m_racks.data(); } /// Return the total size of all racks in bytes - static constexpr size_t data_size() - { - return num_racks() * sizeof(Rack); - } + static constexpr size_t data_size() { return num_racks() * sizeof(Rack); } /// Return the number of racks static constexpr size_t num_racks() diff --git a/include/chilbert/chilbert.ipp b/include/chilbert/chilbert.ipp index cdb0755..bb178bc 100644 --- a/include/chilbert/chilbert.ipp +++ b/include/chilbert/chilbert.ipp @@ -147,7 +147,7 @@ update1(const I& l, const I& t, const I& w, const size_t n, I& e, size_t& d) { assert(d < n); e = l; - e.flip(d); //#D d == n-1 ? 0 : d+1 ); + e.flip(d); // Update direction d += 1 + t.find_first(); @@ -160,7 +160,7 @@ update1(const I& l, const I& t, const I& w, const size_t n, I& e, size_t& d) assert(d < n); if (!w.test(0)) { - e.flip(d == 0 ? n - 1 : d - 1); //#D d ); + e.flip(d == 0 ? n - 1 : d - 1); } } @@ -171,7 +171,7 @@ update2(const I& l, const I& t, const size_t n, I& e, size_t& d) { assert(d < n); e = l; - e.flip(d); //#D d == n-1 ? 0 : d+1 ); + e.flip(d); // Update direction d += 1 + t.find_first(); |