Switch to C++23

.github/workflows/format.yml

@@ -21,7 +21,7 @@ jobs:
       - uses: astral-sh/setup-uv@v6
 
       - name: Check C++ formatting
-        run: uv run --group dev clang-format --dry-run --Werror include/hyperjet/*.h python/src/*.h python/src/*.cpp test/src/*.cpp benchmark/src/*.cpp
+        run: uv run --only-group dev clang-format --dry-run --Werror include/hyperjet/*.h python/src/*.h python/src/*.cpp test/src/*.cpp benchmark/src/*.cpp
 
       - name: Check Python formatting
-        run: uv run --group dev ruff format --check python/tests/
+        run: uv run --only-group dev ruff format --check python/tests/

.github/workflows/test-cpp.yml

@@ -35,8 +35,16 @@ jobs:
           path: "**/cpm_modules"
           key: ${{ github.workflow }}-cpm-modules-${{ matrix.os }}-${{ hashFiles('**/CMakeLists.txt', '**/*.cmake') }}
 
+      - name: Install GCC 14
+        if: runner.os == 'Linux'
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y gcc-14 g++-14
+
       - name: Configure
         run: cmake -Stest -Bbuild -DCMAKE_BUILD_TYPE=${{ matrix.build-type }}
+        env:
+          CXX: ${{ runner.os == 'Linux' && 'g++-14' || '' }}
 
       - name: Build
         run: cmake --build build --config ${{ matrix.build-type }} -j4

.github/workflows/test-python.yml

@@ -30,6 +30,12 @@ jobs:
           path: "**/cpm_modules"
           key: ${{ github.workflow }}-cpm-modules-${{ matrix.os }}-${{ hashFiles('**/CMakeLists.txt', '**/*.cmake') }}
 
+      - name: Install GCC 14
+        if: runner.os == 'Linux'
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y gcc-14 g++-14
+
       - name: Install uv
         uses: astral-sh/setup-uv@v6
 
@@ -38,6 +44,8 @@ jobs:
 
       - name: Install package
         run: uv sync
+        env:
+          CXX: ${{ runner.os == 'Linux' && 'g++-14' || '' }}
 
       - name: Test with pytest
         run: uv run pytest

CMakeLists.txt

@@ -29,7 +29,7 @@ CPMAddPackage("gh:TheLartians/PackageProject.cmake@1.12.0")
 
 add_library(${PROJECT_NAME} INTERFACE)
 
-target_compile_features(${PROJECT_NAME} INTERFACE cxx_std_17)
+target_compile_features(${PROJECT_NAME} INTERFACE cxx_std_23)
 
 target_include_directories(
   ${PROJECT_NAME} INTERFACE $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>

benchmark/CMakeLists.txt

@@ -15,7 +15,7 @@ CPMAddPackage(
 )
 
 if (benchmark_ADDED)
-  set_target_properties(benchmark PROPERTIES CXX_STANDARD 17)
+  set_target_properties(benchmark PROPERTIES CXX_STANDARD 23)
 endif()
 
 CPMAddPackage(
@@ -50,4 +50,4 @@ target_compile_definitions(Benchmark PRIVATE
   -DHYPERJET_EXCEPTIONS
 )
 
-set_target_properties(Benchmark PROPERTIES CXX_STANDARD 17)
+set_target_properties(Benchmark PROPERTIES CXX_STANDARD 23)

include/hyperjet/hyperjet.h

@@ -109,7 +109,7 @@ class DDScalar {
   }
 
   struct Zero {
-    HYPERJET_INLINE Zero operator*(const Scalar) const { return Zero(); }
+    static HYPERJET_INLINE Zero operator()(const Scalar) { return Zero(); }
 
     template <typename T> HYPERJET_INLINE T operator+(const T b) const {
       return b;
@@ -122,15 +122,30 @@ class DDScalar {
   };
 
   struct MinusOne {
-    HYPERJET_INLINE Scalar operator*(const Scalar b) const { return -b; }
+    static HYPERJET_INLINE Scalar operator()(const Scalar b) { return -b; }
   };
 
   struct One {
     HYPERJET_INLINE MinusOne operator-() const { return MinusOne(); }
 
-    HYPERJET_INLINE Scalar operator*(const Scalar b) const { return b; }
+    static HYPERJET_INLINE Scalar operator()(const Scalar b) { return b; }
   };
 
+  template <typename T>
+  static constexpr bool is_tag_v =
+      std::is_same_v<T, Zero> || std::is_same_v<T, One> ||
+      std::is_same_v<T, MinusOne>;
+
+  template <typename TCoeff>
+  HYPERJET_INLINE static auto mul(const TCoeff &coeff,
+                                  const Scalar &val) noexcept {
+    if constexpr (is_tag_v<TCoeff>) {
+      return TCoeff{}(val);
+    } else {
+      return coeff * val;
+    }
+  }
+
   template <bool TIncrement, typename TDa, typename TDaa>
   HYPERJET_INLINE void unary(const Data &a, const Scalar f, const TDa da,
                              const TDaa daa, Data &r) const noexcept {
@@ -144,9 +159,9 @@ class DDScalar {
 
     for (index i = 1; i < n; i++) {
       if constexpr (TIncrement) {
-        r[i] += da * a[i];
+        r[i] += mul(da, a[i]);
       } else {
-        r[i] = da * a[i];
+        r[i] = mul(da, a[i]);
       }
     }
 
@@ -157,7 +172,7 @@ class DDScalar {
     index k = 1 + size();
 
     for (index i = 0; i < size(); i++) {
-      const auto ca = daa * a[1 + i];
+      const auto ca = mul(daa, a[1 + i]);
 
       for (index j = i; j < size(); j++) {
         r[k++] += ca * a[1 + j];
@@ -181,9 +196,9 @@ class DDScalar {
     } else {
       for (index i = 1; i < n; i++) {
         if constexpr (TIncrement) {
-          r[i] += da * a[i] + db * b[i];
+          r[i] += mul(da, a[i]) + mul(db, b[i]);
         } else {
-          r[i] = da * a[i] + db * b[i];
+          r[i] = mul(da, a[i]) + mul(db, b[i]);
         }
       }
     }
@@ -196,8 +211,8 @@ class DDScalar {
       index k = 1 + size();
 
       for (index i = 0; i < size(); i++) {
-        const auto ca = daa * a[1 + i] + dab * b[1 + i];
-        const auto cb = dab * a[1 + i] + dbb * b[1 + i];
+        const auto ca = mul(daa, a[1 + i]) + mul(dab, b[1 + i]);
+        const auto cb = mul(dab, a[1 + i]) + mul(dbb, b[1 + i]);
 
         for (index j = i; j < size(); j++) {
           r[k++] += ca * a[1 + j] + cb * b[1 + j];
@@ -225,9 +240,9 @@ class DDScalar {
     } else {
       for (index i = 1; i < n; i++) {
         if constexpr (TIncrement) {
-          r[i] += da * a[i] + db * b[i] + dc * c[i];
+          r[i] += mul(da, a[i]) + mul(db, b[i]) + mul(dc, c[i]);
         } else {
-          r[i] = da * a[i] + db * b[i] + dc * c[i];
+          r[i] = mul(da, a[i]) + mul(db, b[i]) + mul(dc, c[i]);
         }
       }
     }
@@ -241,9 +256,12 @@ class DDScalar {
       index k = 1 + size();
 
       for (index i = 0; i < size(); i++) {
-        const auto ca = daa * a[1 + i] + dab * b[1 + i] + dac * c[1 + i];
-        const auto cb = dab * a[1 + i] + dbb * b[1 + i] + dbc * c[1 + i];
-        const auto cc = dac * a[1 + i] + dbc * b[1 + i] + dcc * c[1 + i];
+        const auto ca =
+            mul(daa, a[1 + i]) + mul(dab, b[1 + i]) + mul(dac, c[1 + i]);
+        const auto cb =
+            mul(dab, a[1 + i]) + mul(dbb, b[1 + i]) + mul(dbc, c[1 + i]);
+        const auto cc =
+            mul(dac, a[1 + i]) + mul(dbc, b[1 + i]) + mul(dcc, c[1 + i]);
 
         for (index j = i; j < size(); j++) {
           r[k++] += ca * a[1 + j] + cb * b[1 + j] + cc * c[1 + j];
@@ -298,13 +316,9 @@ class DDScalar {
 
   static constexpr index order() { return TOrder; }
 
-  Data &data() { return m_data; }
+  auto &data(this auto &self) { return self.m_data; }
 
-  Scalar const *ptr() const { return m_data.data(); }
-
-  Scalar *ptr() { return m_data.data(); }
-
-  const Data &data() const { return m_data; }
+  auto ptr(this auto &self) { return self.m_data.data(); }
 
   static constexpr index static_size() { return TSize; }
 
@@ -550,59 +564,36 @@ class DDScalar {
     }
   }
 
-  Scalar &f() { return m_data[0]; }
-
-  Scalar f() const { return m_data[0]; }
+  auto &f(this auto &self) { return self.m_data[0]; }
 
   void set_f(const Scalar value) { m_data[0] = value; }
 
-  Scalar &g(const index i) {
-    assert(i < size());
-
-    return m_data[1 + i];
-  }
-
-  Scalar g(const index i) const {
-    assert(0 <= i && i < size());
+  auto &g(this auto &self, const index i) {
+    assert(0 <= i && i < self.size());
 
-    return m_data[1 + i];
+    return self.m_data[1 + i];
   }
 
   void set_g(const index i, const Scalar value) { g(i) = value; }
 
-  Scalar &h(const index i) {
-    assert(0 <= i && i < size() * (size() + 1) / 2);
+  auto &h(this auto &self, const index i) {
+    assert(0 <= i && i < self.size() * (self.size() + 1) / 2);
 
-    return m_data[1 + size() + i];
-  }
-
-  Scalar h(const index i) const {
-    assert(0 <= i && i < size() * (size() + 1) / 2);
-
-    return m_data[1 + size() + i];
+    return self.m_data[1 + self.size() + i];
   }
 
   void set_h(const index i, const Scalar value) { h(i) = value; }
 
-  Scalar &h(const index i, const index j) {
-    assert(0 <= i && i < size());
-    assert(0 <= j && j < size());
-
-    if (i < j) {
-      return m_data[1 + size() + (2 * size() - 1 - i) * i / 2 + j];
-    } else {
-      return m_data[1 + size() + (2 * size() - 1 - j) * j / 2 + i];
-    }
-  }
-
-  Scalar h(const index i, const index j) const {
-    assert(0 <= i && i < size());
-    assert(0 <= j && j < size());
+  auto &h(this auto &self, const index i, const index j) {
+    assert(0 <= i && i < self.size());
+    assert(0 <= j && j < self.size());
 
     if (i < j) {
-      return m_data[1 + size() + (2 * size() - 1 - i) * i / 2 + j];
+      return self
+          .m_data[1 + self.size() + (2 * self.size() - 1 - i) * i / 2 + j];
     } else {
-      return m_data[1 + size() + (2 * size() - 1 - j) * j / 2 + i];
+      return self
+          .m_data[1 + self.size() + (2 * self.size() - 1 - j) * j / 2 + i];
     }
   }
 

python/CMakeLists.txt

@@ -39,7 +39,7 @@ target_compile_definitions(HyperJetPython PRIVATE
   -DHYPERJET_EXCEPTIONS
 )
 
-set_target_properties(HyperJetPython PROPERTIES CXX_STANDARD 17)
+set_target_properties(HyperJetPython PROPERTIES CXX_STANDARD 23)
 
 set_target_properties(HyperJetPython PROPERTIES OUTPUT_NAME hyperjet)
 

python/src/common.h

@@ -36,7 +36,9 @@ template <typename T> auto bind(py::module &m, const std::string &name) {
   }
 
   // properties
-  cls.def_property("f", py::overload_cast<>(&T::f, py::const_), &T::set_f);
+  cls.def_property(
+      "f", [](const T &self) -> typename T::Scalar { return self.f(); },
+      &T::set_f);
 
   // static read-only properties
   cls.def_property_readonly_static("is_dynamic",
@@ -91,8 +93,11 @@ template <typename T> auto bind(py::module &m, const std::string &name) {
       .def("__repr__", &T::to_string)
       .def("abs", &T::abs)
       .def("eval", &T::eval, "d"_a)
-      .def("h", py::overload_cast<hj::index, hj::index>(&T::h), "row"_a,
-           "col"_a)
+      .def(
+          "h",
+          [](const T &self, hj::index row, hj::index col) ->
+          typename T::Scalar { return self.h(row, col); },
+          "row"_a, "col"_a)
       .def("set_h",
            py::overload_cast<hj::index, hj::index, typename T::Scalar>(
                &T::set_h),

test/CMakeLists.txt

@@ -31,7 +31,7 @@ endif()
 file(GLOB sources CONFIGURE_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp)
 add_executable(HyperJetTest ${sources})
 target_link_libraries(HyperJetTest doctest::doctest hyperjet::hyperjet Eigen)
-set_target_properties(HyperJetTest PROPERTIES CXX_STANDARD 17)
+set_target_properties(HyperJetTest PROPERTIES CXX_STANDARD 23)
 
 # --- Add HyperJetTest