diff options
Diffstat (limited to 'include/chilbert/chilbert.ipp')
| -rw-r--r-- | include/chilbert/chilbert.ipp | 15 |
1 files changed, 6 insertions, 9 deletions
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]; } } |