more alignment

Author: SpectraL519

include/gl/impl/specialized/flat_adjacency_matrix.hpp

@@ -18,6 +18,36 @@
 
 namespace gl::impl::specialized {
 
+namespace detail {
+
+template <traits::c_id_type IdType>
+[[nodiscard]] auto& strict_get(flat_matrix<IdType>& id_matrix, const auto& edge) {
+    // get the edge and validate the address
+    const auto [source_id, target_id] = edge.incident_vertices();
+    auto& edge_id = id_matrix[to_idx(source_id), to_idx(target_id)];
+    if (edge.id() != edge_id)
+        throw std::invalid_argument(std::format(
+            "Got invalid edge [id = {} | vertices = ({}, {})]", edge.id(), source_id, target_id
+        ));
+
+    return edge_id;
+}
+
+template <traits::c_id_type IdType>
+inline void check_edge_override(
+    const flat_matrix<IdType>& id_matrix, const IdType source_id, const IdType target_id
+) {
+    if (const auto edge_id = id_matrix[to_idx(source_id), to_idx(target_id)]; edge_id != invalid_id)
+        throw std::logic_error(std::format(
+            "Cannot override an existing edge: [id = {}, vertices = ({}, {})]",
+            edge_id,
+            source_id,
+            target_id
+        ));
+}
+
+} // namespace detail
+
 template <traits::c_instantiation_of<adjacency_matrix> AdjacencyMatrix>
 requires(traits::c_directed_edge<typename AdjacencyMatrix::edge_type>)
 struct directed_flat_adjacency_matrix {

include/gl/types/flat_matrix.hpp

@@ -99,8 +99,9 @@ class flat_matrix {
         /// @brief Dereferences the iterator to the current row.
         /// @return A subrange representing the row at the current position
         [[nodiscard]] reference operator*() const noexcept {
-            const auto row_beg = this->_data_iter + this->_row_idx * this->_row_size;
-            return reference(row_beg, row_beg + this->_row_size);
+            const auto row_beg =
+                this->_data_iter + static_cast<std::ptrdiff_t>(this->_row_idx * this->_row_size);
+            return reference(row_beg, row_beg + static_cast<std::ptrdiff_t>(this->_row_size));
         }
 
         /// @brief Random access to a row at an offset from the current position.
@@ -484,8 +485,8 @@ class flat_matrix {
     /// @pre `r < n_rows()`; otherwise Undefined Behavior
     /// @warning No bounds checking is performed for performance.
     [[nodiscard]] row_type operator[](size_type r) {
-        const auto row_beg = this->_data.begin() + r * this->_n_cols;
-        return row_type(row_beg, row_beg + this->_n_cols);
+        const auto row_beg = this->_data.begin() + static_cast<std::ptrdiff_t>(r * this->_n_cols);
+        return row_type(row_beg, row_beg + static_cast<std::ptrdiff_t>(this->_n_cols));
     }
 
     /// @brief Returns a const row at the given index without bounds checking.
@@ -494,8 +495,8 @@ class flat_matrix {
     /// @pre `r < n_rows()`; otherwise Undefined Behavior
     /// @warning No bounds checking is performed.
     [[nodiscard]] const_row_type operator[](size_type r) const {
-        const auto row_beg = this->_data.begin() + r * this->_n_cols;
-        return const_row_type(row_beg, row_beg + this->_n_cols);
+        const auto row_beg = this->_data.begin() + static_cast<std::ptrdiff_t>(r * this->_n_cols);
+        return const_row_type(row_beg, row_beg + static_cast<std::ptrdiff_t>(this->_n_cols));
     }
 
     /// @brief Returns a reference to an element without bounds checking.

tests/CMakeLists.txt

@@ -1,15 +1,6 @@
 cmake_minimum_required(VERSION 3.12)
 project(cpp-gl-test)
 
-# Set compile options
-if(NOT DEFINED CMAKE_CXX_FLAGS)
-    set(
-        CMAKE_CXX_FLAGS
-        "-Werror -Wall -Wextra -Wcast-align -Wconversion -Wsign-conversion -Wunreachable-code -Wuninitialized -Wunused -pedantic -g -O2"
-        CACHE STRING "Default C++ compile flags" FORCE
-    )
-endif()
-
 # Common structure
 set(SOURCE_DIRS "app")
 set(INCLUDE_DIRS "include" "external")
@@ -33,7 +24,20 @@ function(add_test_target TARGET_NAME SOURCE_DIRS DATA_DIR TESTING_DEF)
     )
 
     target_include_directories(${TARGET_NAME} PRIVATE ${INCLUDE_DIRS})
-    target_compile_options(${TARGET_NAME} PRIVATE ${CMAKE_CXX_FLAGS})
+    # target_compile_options(${TARGET_NAME} PRIVATE
+    #     -Werror
+    #     -Wall
+    #     -Wextra
+    #     -Wcast-align
+    #     -Wconversion
+    #     -Wsign-conversion
+    #     -Wunreachable-code
+    #     -Wuninitialized
+    #     -Wunused
+    #     -pedantic
+    #     -g
+    #     -O2
+    # )
     target_compile_definitions(${TARGET_NAME} PRIVATE
         ${TESTING_DEF}
         TEST_DATA_PATH="${DATA_DIR}"

tests/source/gl/test_adjacency_matrix.cpp

@@ -74,8 +74,6 @@ TEST_CASE_TEMPLATE_DEFINE(
     }
 
     SUBCASE("add_edge should throw an error if the vertices are already incident") {
-        using edge_type = typename SutType::edge_type;
-
         SutType sut{constants::n_elements};
         sut.add_edge(fixture.next_edge_id++, constants::v1_id, constants::v2_id);
         REQUIRE(sut.has_edge(constants::v1_id, constants::v2_id));