Code cleanup

Author: VioletGiraffe

math/math.hpp

@@ -115,11 +115,10 @@ template <typename ResultType, typename... Args>
 constexpr ResultType arithmeticMean(Args&&... args) noexcept
 {
 ResultType acc = ResultType(0);
-size_t n = 0;
+constexpr size_t n = sizeof...(Args);
 
 pack::for_value([&](auto&& value) {
 acc += value;
-++n;
 }, std::forward<Args>(args)...);
 
 return acc / n;

parameter_pack/parameter_pack_helpers.hpp

@@ -1,9 +1,7 @@
 #pragma once
 
 #include "../utility/constexpr_algorithms.hpp"
-#include "../utility/integer_literals.hpp"
 #include "../utility/optional_consteval.hpp"
-#include "../utility/template_magic.hpp"
 
 #include <tuple>
 #include <type_traits>

tests/test-app/constexpr_algos_tests.cpp

@@ -1,6 +1,7 @@
 #include "3rdparty/catch2/catch.hpp"
-#include "utility/constexpr_algorithms.hpp"
 #include "tuple/tuple_helpers.hpp"
+#include "utility/constexpr_algorithms.hpp"
+#include "utility/template_magic.hpp"
 
 #include <array>
 #include <numeric>

tests/test-app/math_tests.cpp

@@ -1,11 +1,19 @@
 #include "3rdparty/catch2/catch.hpp"
 #include "math/math.hpp"
 
-TEST_CASE("pow2")
+TEST_CASE("pow2", "[math]")
 {
 uint64_t p = 2;
 for (uint64_t i = 1; i < 63; ++i, p *= 2)
 CHECK(Math::pow2(i) == p);
 
 static_assert(Math::pow2(16) == 65536);
 }
+
+TEST_CASE("arithmeticMean", "[math]")
+{
+REQUIRE(Math::arithmeticMean<int>(2, 4, 6) == 4);
+REQUIRE(Math::arithmeticMean<float>(2, 1) == 1.5f);
+
+static_assert(Math::arithmeticMean<int>(99, 1, 0, 4) == 26);
+}

tests/test-app/odd_sized_integer_tests.cpp

@@ -3,7 +3,7 @@
 #include "utility/odd_sized_integer.hpp"
 #include "math/math.hpp"
 
-TEST_CASE("Construction from and conversion to regular integer")
+TEST_CASE("Construction from and conversion to regular integer", "[odd_sized_integer]")
 {
 static constexpr size_t N = 3;
 
@@ -20,7 +20,7 @@ TEST_CASE("Construction from and conversion to regular integer")
 }
 }
 
-TEST_CASE("Copy construction")
+TEST_CASE("Copy construction", "[odd_sized_integer]")
 {
 odd_sized_integer<5> oi {5};
 const auto oi2 = oi;
@@ -29,15 +29,15 @@ TEST_CASE("Copy construction")
 REQUIRE(oi2 == 5);
 }
 
-TEST_CASE("Move construction")
+TEST_CASE("Move construction", "[odd_sized_integer]")
 {
 odd_sized_integer<5> oi {5};
 const auto oi2 = std::move(oi);
 
 REQUIRE(oi2 == 5);
 }
 
-TEST_CASE("Assignemnt and move assignment")
+TEST_CASE("Assignemnt and move assignment", "[odd_sized_integer]")
 {
 odd_sized_integer<5> oi {5};
 
@@ -53,7 +53,7 @@ TEST_CASE("Assignemnt and move assignment")
 CHECK(oi == 500'000);
 }
 
-TEST_CASE("comparison operators")
+TEST_CASE("comparison operators", "[odd_sized_integer]")
 {
 odd_sized_integer<7> o1 {7};
 odd_sized_integer<7> o2 {7'000'000'000ULL};
@@ -90,7 +90,7 @@ TEST_CASE("comparison operators")
 CHECK(!(o2 != o3.toUi64()));
 }
 
-TEST_CASE("Arithmetics")
+TEST_CASE("Arithmetics", "[odd_sized_integer]")
 {
 odd_sized_integer<7> oi {7};
 CHECK(oi + 10 == 17);

utility/constexpr_algorithms.hpp

@@ -1,5 +1,4 @@
 #pragma once
-#include "template_magic.hpp"
 
 #include <type_traits>
 #include <utility>
@@ -46,7 +45,7 @@ constexpr void constexpr_for_fold([[maybe_unused]] Functor&& f) noexcept
 {
 if constexpr (First < Last)
 {
-static_assert(std::is_same_v<void, decltype(f. template operator() < First > ())>, "This implementation does not take return value into account!");
+static_assert(std::is_same_v<void, decltype(f. template operator()<First>())>, "This implementation does not take return value into account!");
 detail::constexpr_for_fold_impl<First>(std::forward<Functor>(f), std::make_index_sequence<Last - First>{});
 }
 }

utility/optional_consteval.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
-// std::optional has very limited constexpr support C++20 and earlier standards.
-// This is a consteval class that implements std::optional interface.
+// std::optional has very limited constexpr support in C++20 and earlier standards.
+// This is a consteval class that implements std::optional interface for use in compile-time calculations.
 
 template <typename T>
 class optional_consteval {