more wip

Author: SpectraL519

include/gl/graph.hpp

@@ -6,6 +6,9 @@
 // - impl::add_edge should accept: id, first, second
 // - impl::add_edges_from should accept: edge_ids view, source_id, target_id_range
 // - impl::remove_edge should accept: id, first, second
+// - add a get_vertex_properties(id) function
+// - add a get_edge_properties(id) function
+// - add n_adjacent_edges(id) function
 
 #pragma once
 
@@ -253,8 +256,6 @@ class graph final {
         return this->_impl.degree_map();
     }
 
-    // TODO: add a get_vertex_properties function
-
     [[nodiscard]] gl_attr_force_inline auto vertex_properties_map() const noexcept
     requires(not type_traits::is_default_properties_type_v<vertex_properties_type>)
     {

include/gl/impl/adjacency_matrix.hpp

@@ -11,6 +11,13 @@
 #include "gl/types/types.hpp"
 #include "specialized/adjacency_matrix.hpp"
 
+#ifdef GL_TESTING
+namespace gl_testing {
+struct test_adjacency_matrix;
+} // namespace gl_testing
+#endif
+
+
 namespace gl::impl {
 
 template <type_traits::c_matrix_graph_traits GraphTraits>
@@ -164,30 +171,39 @@ class adjacency_matrix final {
 
     [[nodiscard]] gl_attr_force_inline auto adjacent_edges(const types::id_type vertex_id) const {
         return this->_matrix[vertex_id] | std::views::enumerate
-             | std::views::filter([](const auto target_id, const auto edge_id) {
+             | std::views::filter([](const auto& edge_info) {
+                   const auto& [target_id, edge_id] = edge_info;
                    return edge_id != constants::invalid_id;
                })
-             | std::views::transform([vertex_id](const auto target_id, const auto edge_id) {
-                   return edge_type{edge_id, vertex_id, target_id};
+             | std::views::transform([vertex_id](const auto& edge_info) {
+                   const auto& [target_id, edge_id] = edge_info;
+                   return edge_type{edge_id, vertex_id, static_cast<types::id_type>(target_id)};
                });
     }
 
     [[nodiscard]] gl_attr_force_inline auto adjacent_edges(
         const types::id_type vertex_id, const auto& edge_properties_map
     ) const {
         return this->_matrix[vertex_id] | std::views::enumerate
-             | std::views::filter([](const auto target_id, const auto edge_id) {
+             | std::views::filter([](const auto& edge_info) {
+                   const auto& [target_id, edge_id] = edge_info;
                    return edge_id != constants::invalid_id;
                })
-             | std::views::transform(
-                   [vertex_id, &edge_properties_map](const auto target_id, const auto edge_id) {
-                       return edge_type{
-                           edge_id, vertex_id, target_id, edge_properties_map[edge_id]
-                       };
-                   }
-             );
+             | std::views::transform([vertex_id, &edge_properties_map](const auto& edge_info) {
+                   const auto& [target_id, edge_id] = edge_info;
+                   return edge_type{
+                       edge_id,
+                       vertex_id,
+                       static_cast<types::id_type>(target_id),
+                       edge_properties_map[edge_id]
+                   };
+               });
     }
 
+#ifdef GL_TESTING
+    friend struct gl_testing::test_adjacency_matrix;
+#endif
+
 private:
     using specialized_impl = typename specialized::matrix_impl_traits<adjacency_matrix>::type;
     friend specialized_impl;

include/gl/impl/specialized/adjacency_matrix.hpp

@@ -151,7 +151,7 @@ struct directed_adjacency_matrix {
         const type_traits::c_sized_range_of<types::id_type> auto& target_ids
     ) {
         for (const auto target_id : target_ids)
-            detail::check_edge_override(self, source_id, target_id);
+            detail::check_edge_override(self._matrix, source_id, target_id);
 
         auto& matrix_source_row = self._matrix[source_id];
         for (auto [edge_id, target_id] : std::views::zip(edge_ids, target_ids))
@@ -170,7 +170,6 @@ struct undirected_adjacency_matrix {
     using impl_type = AdjacencyMatrix;
     using vertex_type = typename impl_type::vertex_type;
     using edge_type = typename impl_type::edge_type;
-    using edge_ptr_type = typename impl_type::edge_ptr_type;
 
     [[nodiscard]] gl_attr_force_inline static types::size_type in_degree(
         const impl_type& self, const types::id_type vertex_id
@@ -240,7 +239,7 @@ struct undirected_adjacency_matrix {
     static void add_edge(
         impl_type& self, types::id_type edge_id, types::id_type source_id, types::id_type target_id
     ) {
-        detail::check_edge_override<impl_type>(self, source_id, target_id);
+        detail::check_edge_override(self._matrix, source_id, target_id);
 
         self._matrix[source_id][target_id] = edge_id;
         if (target_id != source_id)
@@ -254,7 +253,7 @@ struct undirected_adjacency_matrix {
         const type_traits::c_sized_range_of<types::id_type> auto& target_ids
     ) {
         for (const auto target_id : target_ids)
-            detail::check_edge_override(self, source_id, target_id);
+            detail::check_edge_override(self._matrix, source_id, target_id);
 
         auto& matrix_source_row = self._matrix[source_id];
         for (auto [edge_id, target_id] : std::views::zip(edge_ids, target_ids)) {

include/gl/util/ranges.hpp

@@ -0,0 +1,18 @@
+// Copyright (c) 2024-2026 Jakub Musiał
+// This file is part of the CPP-GL project (https://github.com/SpectraL519/cpp-gl).
+// Licensed under the MIT License. See the LICENSE file in the project root for full license information.
+
+#include <ranges>
+
+namespace gl::util {
+
+template <std::ranges::range R>
+constexpr auto range_size(R&& r) {
+    if constexpr (std::ranges::sized_range<R>)
+        return std::ranges::size(r);
+    else
+        // Will consume input ranges!
+        return std::ranges::distance(std::begin(r), std::end(r));
+}
+
+} // namespace gl::util