update name

Author: jamierpond

inc/zoo/swar/associative_iteration.h

@@ -223,21 +223,24 @@ constexpr auto multiply(T a , T b) {
     };
 
     auto halver = [](auto count) {
-      return count >> 1;
+      return count << 1;
     };
 
     constexpr auto numBits = sizeof(T) * 8;
+    constexpr auto msb = 1 << (numBits - 1);
     return associativeOperatorIterated_regressive(
         a,         // base
         0,         // neutral
         b,         // count
-        1,         // forSquaring, pretty sure this is where i am not understanding
+        0,       // forSquaring, pretty sure this is where i am not understanding
         operation, // operation
         numBits,   // log2Count
         halver     // halver
     );
 }
 
+// static_assert(multiply(3, 4) == 12, "multiply failed");
+
 template<int ActualBits, int NB, typename T>
 constexpr auto multiplication_OverflowUnsafe_SpecificBitCount(
     SWAR<NB, T> multiplicand, SWAR<NB, T> multiplier
@@ -267,7 +270,7 @@ constexpr auto multiplication_OverflowUnsafe_SpecificBitCount(
 }
 
 template<int ActualBits, int NB, typename T>
-constexpr auto expo_OverflowUnsafe_SpecificBitCount(
+constexpr auto exponentiation_OverflowUnsafe_SpecificBitCount(
     SWAR<NB, T> x,
     SWAR<NB, T> exponent
 ) {
@@ -339,12 +342,12 @@ constexpr auto multiplication_OverflowUnsafe(
 }
 
 template<int NB, typename T>
-constexpr auto expo_OverflowUnsafe(
+constexpr auto exponentiation_OverflowUnsafe(
     SWAR<NB, T> base,
     SWAR<NB, T> exponent
 ) {
     return
-       expo_OverflowUnsafe_SpecificBitCount<NB>(
+       exponentiation_OverflowUnsafe_SpecificBitCount<NB>(
             base, exponent
         );
 }

test/swar/BasicOperations.cpp

@@ -42,10 +42,10 @@ static_assert(
 );
 
 TEST_CASE("Jamie's totally working exponentiation :D") {
-    constexpr auto base     = SWAR<8, u32>{0x02'00'05'06}; //   2 | 0 |  5 |   6
+    constexpr auto base     = SWAR<8, u32>{0x02'01'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 | 25 | 216
-    constexpr auto actual = expo_OverflowUnsafe(base, exponent);
+    constexpr auto actual = exponentiation_OverflowUnsafe(base, exponent);
     static_assert(expected.value() == actual.value());
     CHECK(expected.value() == actual.value());
 }