aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.clang-tidy5
-rw-r--r--benchmark/bench_bitvec.cpp5
-rw-r--r--benchmark/bench_hilbert.cpp4
-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
-rw-r--r--meson_options.txt6
-rw-r--r--test/test_bitvec.cpp4
-rw-r--r--test/test_gray_code_rank.cpp4
-rw-r--r--test/test_hilbert.cpp4
-rw-r--r--test/test_utils.hpp4
14 files changed, 56 insertions, 80 deletions
diff --git a/.clang-tidy b/.clang-tidy
index 64946df..8acbf15 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -1,4 +1,4 @@
-# Copyright 2020-2024 David Robillard <d@drobilla.net>
+# Copyright 2020-2025 David Robillard <d@drobilla.net>
# SPDX-License-Identifier: 0BSD OR GPL-2.0-or-later
Checks: >
@@ -21,10 +21,9 @@ Checks: >
-google-runtime-int,
-google-runtime-references,
-llvmlibc-*,
+ -misc-confusable-identifiers,
-misc-include-cleaner,
-modernize-use-trailing-return-type,
- -readability-avoid-const-params-in-decls,
- -readability-convert-member-functions-to-static,
-readability-identifier-length,
-readability-implicit-bool-conversion,
WarningsAsErrors: '*'
diff --git a/benchmark/bench_bitvec.cpp b/benchmark/bench_bitvec.cpp
index bddde23..2493947 100644
--- a/benchmark/bench_bitvec.cpp
+++ b/benchmark/bench_bitvec.cpp
@@ -15,6 +15,8 @@
#include <string>
#include <vector>
+namespace {
+
template<class T, size_t N>
struct BenchAnd {
Duration operator()(Context& ctx)
@@ -209,6 +211,7 @@ struct BenchComparison {
Duration operator()(Context& ctx)
{
std::vector<T> vecs;
+ vecs.reserve(32);
for (size_t i = 0; i < 32; ++i) {
vecs.emplace_back(make_random_bitvec<T, N>(ctx));
}
@@ -279,6 +282,8 @@ bench(Context& ctx, const std::string& name)
bench_rec<Bench, 16, 32, 64, 128, 256, 512>(ctx, out);
}
+} // namespace
+
int
main()
{
diff --git a/benchmark/bench_hilbert.cpp b/benchmark/bench_hilbert.cpp
index b8cd9d6..2d265c3 100644
--- a/benchmark/bench_hilbert.cpp
+++ b/benchmark/bench_hilbert.cpp
@@ -15,6 +15,8 @@
#include <fstream>
#include <string>
+namespace {
+
template<class H, size_t M, size_t D>
struct BenchCoordsToIndex {
Duration operator()(Context& ctx)
@@ -82,6 +84,8 @@ bench(Context& ctx, const std::string& name)
bench_rec<Bench, 8, 2, 4, 8, 16, 32, 64>(ctx, out);
}
+} // namespace
+
int
main()
{
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
diff --git a/meson_options.txt b/meson_options.txt
index 6472e14..7a12844 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,11 +1,11 @@
# Copyright 2019-2023 David Robillard <d@drobilla.net>
# SPDX-License-Identifier: 0BSD OR GPL-2.0-or-later
-option('benchmarks', type: 'feature', value: 'auto', yield: true,
+option('benchmarks', type: 'feature', yield: true,
description: 'Build benchmarks')
-option('tests', type: 'feature', value: 'auto', yield: true,
+option('tests', type: 'feature', yield: true,
description: 'Build tests')
-option('tools', type: 'feature', value: 'auto', yield: true,
+option('tools', type: 'feature', yield: true,
description: 'Build command line utilities')
diff --git a/test/test_bitvec.cpp b/test/test_bitvec.cpp
index e03a27f..d25e3ff 100644
--- a/test/test_bitvec.cpp
+++ b/test/test_bitvec.cpp
@@ -16,6 +16,8 @@
#include <cstddef>
#include <cstdlib>
+namespace {
+
template<class T, size_t N>
void
test_and(Context& ctx)
@@ -324,6 +326,8 @@ test(Context& ctx)
test_iteration<T, N>(ctx);
}
+} // namespace
+
int
main()
{
diff --git a/test/test_gray_code_rank.cpp b/test/test_gray_code_rank.cpp
index 1bb70cb..26432b8 100644
--- a/test/test_gray_code_rank.cpp
+++ b/test/test_gray_code_rank.cpp
@@ -19,6 +19,8 @@
#include <cstddef>
#include <iterator>
+namespace {
+
template<class T, size_t Max, size_t D>
T
get_mask(const std::array<size_t, D>& ms, const size_t d, const size_t step)
@@ -106,6 +108,8 @@ test(Context& ctx)
test_gray_code_rank<T, Max, D>(ctx);
}
+} // namespace
+
int
main()
{
diff --git a/test/test_hilbert.cpp b/test/test_hilbert.cpp
index 53177ec..6a1862d 100644
--- a/test/test_hilbert.cpp
+++ b/test/test_hilbert.cpp
@@ -33,6 +33,8 @@ _Pragma("clang diagnostic pop")
#include <cstddef>
#include <cstdint>
+namespace {
+
/// Return a `D`-dimensional point within `ms` per-dimension precision
template<size_t D>
std::array<uint64_t, D>
@@ -159,6 +161,8 @@ test_compact(Context& ctx)
assert(squared_distance(pa, pb) == 1);
}
+} // namespace
+
int
main()
{
diff --git a/test/test_utils.hpp b/test/test_utils.hpp
index 5f4c03f..cc9c1f8 100644
--- a/test/test_utils.hpp
+++ b/test/test_utils.hpp
@@ -44,7 +44,7 @@ static inline size_t
rand_between(Context& ctx, const size_t min, const size_t max)
{
assert(max >= min);
- const size_t r = (max == min) ? min : ctx.dist(ctx.rng) % (max - min) + min;
+ const size_t r = (max == min) ? min : (ctx.dist(ctx.rng) % (max - min)) + min;
assert(r >= min && r < max);
return r;
}
@@ -58,7 +58,7 @@ make_random_precisions(Context& ctx)
size_t bits_left = N;
for (size_t i = 0; i < D; ++i) {
- ms[i] = rand_between(ctx, 1, std::min(Max, bits_left / (D - i) + 1));
+ ms[i] = rand_between(ctx, 1, std::min(Max, (bits_left / (D - i)) + 1));
bits_left -= ms[i];
}
generated by cgit v1.2.1 (git 2.18.0) at 2025-04-06 09:21:20 +0000