aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/chilbert/BoundedBitVec.hpp40
-rw-r--r--include/chilbert/StaticBitVec.hpp35
-rw-r--r--include/chilbert/chilbert.ipp15
-rw-r--r--include/chilbert/detail/BitVecIndex.hpp2
-rw-r--r--include/chilbert/detail/MultiBitVec.hpp6
-rw-r--r--include/chilbert/detail/operations.hpp2
6 files changed, 28 insertions, 72 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..3aa9e37 100644
--- a/include/chilbert/chilbert.ipp
+++ b/include/chilbert/chilbert.ipp
@@ -7,6 +7,7 @@
#include "chilbert/SmallBitVec.hpp"
#include "chilbert/StaticBitVec.hpp"
#include "chilbert/detail/gray_code_rank.hpp"
+#include "chilbert/detail/operations.hpp"
#include <cassert>
#include <climits>
@@ -147,7 +148,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 +161,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 +172,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();
@@ -292,9 +293,7 @@ coords_to_compact_index(const P& p,
M = m = 0;
for (size_t i = 0; i < n; ++i) {
assert(num_bits(p[i]) >= ms[i]);
- if (ms[i] > m) {
- m = ms[i];
- }
+ m = std::max(ms[i], m);
M += ms[i];
}
}
@@ -344,9 +343,7 @@ compact_index_to_coords(P& p,
if (M == 0 || m == 0) {
M = m = 0;
for (size_t i = 0; i < n; ++i) {
- if (ms[i] > m) {
- m = ms[i];
- }
+ m = std::max(ms[i], m);
M += ms[i];
}
}
diff --git a/include/chilbert/detail/BitVecIndex.hpp b/include/chilbert/detail/BitVecIndex.hpp
index a514c21..7eb128d 100644
--- a/include/chilbert/detail/BitVecIndex.hpp
+++ b/include/chilbert/detail/BitVecIndex.hpp
@@ -21,7 +21,7 @@ struct BitVecIndex {
explicit BitVecIndex(const size_t bits)
: rack{bits / bits_per_rack}
- , bit{bits - rack * bits_per_rack}
+ , bit{bits - (rack * bits_per_rack)}
{
assert(bit < bits_per_rack);
}
diff --git a/include/chilbert/detail/MultiBitVec.hpp b/include/chilbert/detail/MultiBitVec.hpp
index bf1802c..1317d3b 100644
--- a/include/chilbert/detail/MultiBitVec.hpp
+++ b/include/chilbert/detail/MultiBitVec.hpp
@@ -111,7 +111,7 @@ public:
/// Clear any bits in storage outside the valid range if necessary
void truncate()
{
- if (const auto pad = num_racks() * bits_per_rack - size()) {
+ if (const auto pad = (num_racks() * bits_per_rack) - size()) {
rack(num_racks() - 1) &= ~Rack{0} >> pad;
}
}
@@ -334,6 +334,10 @@ public:
private:
using Index = detail::BitVecIndex<Derived>;
+ friend Derived;
+
+ MultiBitVec() = default;
+
Derived* self() { return static_cast<Derived*>(this); }
const Derived* self() const { return static_cast<const Derived*>(this); }
};
diff --git a/include/chilbert/detail/operations.hpp b/include/chilbert/detail/operations.hpp
index 5dd59db..b7aff09 100644
--- a/include/chilbert/detail/operations.hpp
+++ b/include/chilbert/detail/operations.hpp
@@ -110,7 +110,7 @@ pop_count(const uint64_t field)
/// Return 1 + the index of the least significant 1-bit of `field`, or zero
template<typename T>
inline int
-pop_count(const T field);
+pop_count(T field);
template<>
inline int
generated by cgit v1.2.1 (git 2.18.0) at 2025-04-05 05:27:39 +0000