gl alignment

Author: SpectraL519

include/gl/impl/adjacency_matrix.hpp

@@ -107,17 +107,17 @@ class adjacency_matrix final {
     }
 
     [[nodiscard]] gl_attr_force_inline bool has_edge(id_type source_id, id_type target_id) const {
-        return specialized_impl::get_edge_id(*this, source_id, target_id) != invalid_id;
+        return specialized_impl::get_entry(*this, source_id, target_id) != invalid_id;
     }
 
     [[nodiscard]] bool has_edge(const edge_type& edge) const {
-        return specialized_impl::get_edge_id(*this, edge.source(), edge.target()) == edge.id();
+        return specialized_impl::get_entry(*this, edge.source(), edge.target()) == edge.id();
     }
 
     [[nodiscard]] std::optional<edge_type> get_edge(id_type source_id, id_type target_id) const
     requires(traits::c_has_empty_properties<edge_type>)
     {
-        const auto edge_id = specialized_impl::get_edge_id(*this, source_id, target_id);
+        const auto edge_id = specialized_impl::get_entry(*this, source_id, target_id);
         if (edge_id == invalid_id)
             return std::nullopt;
         return std::make_optional<edge_type>(edge_id, source_id, target_id);
@@ -128,7 +128,7 @@ class adjacency_matrix final {
     ) const
     requires(traits::c_has_non_empty_properties<edge_type>)
     {
-        const auto edge_id = specialized_impl::get_edge_id(*this, source_id, target_id);
+        const auto edge_id = specialized_impl::get_entry(*this, source_id, target_id);
         if (edge_id == invalid_id)
             return std::nullopt;
         return std::make_optional<edge_type>(
@@ -139,7 +139,7 @@ class adjacency_matrix final {
     [[nodiscard]] std::vector<edge_type> get_edges(id_type source_id, id_type target_id) const
     requires(traits::c_has_empty_properties<edge_type>)
     {
-        const auto edge_id = specialized_impl::get_edge_id(*this, source_id, target_id);
+        const auto edge_id = specialized_impl::get_entry(*this, source_id, target_id);
         if (edge_id == invalid_id)
             return std::vector<edge_type>();
         return std::vector<edge_type>{
@@ -152,7 +152,7 @@ class adjacency_matrix final {
     ) const
     requires(traits::c_has_non_empty_properties<edge_type>)
     {
-        const auto edge_id = specialized_impl::get_edge_id(*this, source_id, target_id);
+        const auto edge_id = specialized_impl::get_entry(*this, source_id, target_id);
         if (edge_id == invalid_id)
             return std::vector<edge_type>();
         return std::vector<edge_type>{
@@ -197,11 +197,13 @@ class adjacency_matrix final {
     {
         return std::views::iota(initial_id_v<id_type>, this->_matrix.size())
              | std::views::filter([this, vertex_id](const auto source_id) {
-                   return this->_matrix[to_idx(source_id)][to_idx(vertex_id)] != invalid_id;
+                   return specialized_impl::get_entry(*this, source_id, vertex_id) != invalid_id;
                })
              | std::views::transform([this, vertex_id](const auto source_id) {
                    return edge_type{
-                       this->_matrix[to_idx(source_id)][to_idx(vertex_id)], source_id, vertex_id
+                       specialized_impl::get_entry(*this, source_id, vertex_id),
+                       source_id,
+                       vertex_id
                    };
                });
     }
@@ -213,10 +215,10 @@ class adjacency_matrix final {
     {
         return std::views::iota(initial_id_v<id_type>, this->_matrix.size())
              | std::views::filter([this, vertex_id](const auto source_id) {
-                   return this->_matrix[to_idx(source_id)][to_idx(vertex_id)] != invalid_id;
+                   return specialized_impl::get_entry(*this, source_id, vertex_id) != invalid_id;
                })
              | std::views::transform([this, vertex_id, &edge_properties_map](const auto source_id) {
-                   const auto edge_id = this->_matrix[to_idx(source_id)][to_idx(vertex_id)];
+                   const auto edge_id = specialized_impl::get_entry(*this, source_id, vertex_id);
                    return edge_type{
                        edge_id, source_id, vertex_id, *edge_properties_map[to_idx(edge_id)]
                    };

include/gl/impl/specialized/adjacency_matrix.hpp

@@ -165,7 +165,7 @@ struct directed_adjacency_matrix {
         return removed_edges;
     }
 
-    static id_type get_edge_id(const impl_type& self, id_type source_id, id_type target_id) {
+    static id_type get_entry(const impl_type& self, id_type source_id, id_type target_id) {
         return self._matrix[to_idx(source_id)][to_idx(target_id)];
     }
 
@@ -289,7 +289,7 @@ struct undirected_adjacency_matrix {
         return removed_edges;
     }
 
-    static id_type get_edge_id(const impl_type& self, id_type source_id, id_type target_id) {
+    static id_type get_entry(const impl_type& self, id_type source_id, id_type target_id) {
         return self._matrix[to_idx(source_id)][to_idx(target_id)];
     }
 

include/gl/impl/specialized/flat_adjacency_matrix.hpp

@@ -97,9 +97,10 @@ struct directed_flat_adjacency_matrix {
         const auto row = self._matrix[vertex_idx];
         const auto col = self._matrix.col(vertex_idx);
 
-        for (auto v_idx = 0uz; v_idx < self._matrix.n_rows(); ++v_idx)
-            deg += static_cast<size_type>(row[v_idx] != invalid_id)
-                 + static_cast<size_type>(col[static_cast<std::ptrdiff_t>(v_idx)] != invalid_id);
+        const auto n_rows_bound = to_diff(self._matrix.n_rows());
+        for (auto v_pos = 0z; v_pos < n_rows_bound; ++v_pos)
+            deg += static_cast<size_type>(row[v_pos] != invalid_id)
+                 + static_cast<size_type>(col[v_pos] != invalid_id);
 
         return deg;
     }
@@ -152,7 +153,7 @@ struct directed_flat_adjacency_matrix {
             if (r_idx == vertex_idx)
                 continue;
 
-            const auto edge_id = col[static_cast<std::ptrdiff_t>(r_idx)];
+            const auto edge_id = col[to_diff(r_idx)];
             if (edge_id != invalid_id)
                 removed_edges.push_back(edge_id);
         }
@@ -164,7 +165,7 @@ struct directed_flat_adjacency_matrix {
         return removed_edges;
     }
 
-    static id_type get_edge_id(const impl_type& self, id_type source_id, id_type target_id) {
+    static id_type get_entry(const impl_type& self, id_type source_id, id_type target_id) {
         return self._matrix[to_idx(source_id), to_idx(target_id)];
     }
 
@@ -281,7 +282,7 @@ struct undirected_flat_adjacency_matrix {
         return removed_edges;
     }
 
-    static id_type get_edge_id(const impl_type& self, id_type source_id, id_type target_id) {
+    static id_type get_entry(const impl_type& self, id_type source_id, id_type target_id) {
         return self._matrix[to_idx(source_id), to_idx(target_id)];
     }