tidy up

Author: jamierpond

inc/zoo/swar/associative_iteration.h

@@ -225,6 +225,7 @@ constexpr auto associativeOperatorIterated_regressive(
 }
 
 
+// What I don't understand is why this doesn't work?
 template <typename T>
 constexpr auto multiply(T a , T b) {
     auto operation = [](auto left, auto right, auto count) {
@@ -251,37 +252,6 @@ constexpr auto multiply(T a , T b) {
     );
 }
 
-// static_assert(multiply(2, 3) == 6);
-
-template <typename T>
-constexpr auto expo(T base, T exponent) {
-
-    auto operation = [](auto left, auto right, auto counts) {
-      if (counts) {
-        return left * right;
-      } else {
-        return left;
-      }
-    };
-
-    auto halver = [](auto counts) {
-      return counts >> 1;
-    };
-
-    constexpr auto numBits = sizeof(T) * 8;
-    return associativeOperatorIterated_regressive(
-        base,
-        1,
-        exponent,
-        meta::BitmaskMaker<T, 1, numBits>().value << 1,
-        operation,
-        numBits,
-        halver
-    );
-}
-
-// static_assert(expo(2, 3) == 8, "expo(2, 3) == 8");
-
 template<int ActualBits, int NB, typename T>
 constexpr auto multiplication_OverflowUnsafe_SpecificBitCount(
     SWAR<NB, T> multiplicand, SWAR<NB, T> multiplier

test/swar/BasicOperations.cpp

@@ -42,9 +42,9 @@ static_assert(
 );
 
 TEST_CASE("Jamie's totally working exponentiation :D") {
-    constexpr auto base     = SWAR<8, u32>{0x02'01'05'06}; //   2 | 1 |  5 |   6
+    constexpr auto base     = SWAR<8, u32>{0x02'00'05'06}; //   2 | 0 |  5 |   6
     constexpr auto exponent = SWAR<8, u32>{0x07'00'02'03}; //   7 | 0 |  2 |   3
-    constexpr auto expected = SWAR<8, u32>{0x80'01'19'D8}; // 128 | 1 | 19 | 216
+    constexpr auto expected = SWAR<8, u32>{0x80'01'19'D8}; // 128 | 1 | 25 | 216
     constexpr auto actual = expo_OverflowUnsafe(base, exponent);
     static_assert(expected.value() == actual.value());
     CHECK(expected.value() == actual.value());