resolved comments

Author: SpectraL519

include/gl/edge_descriptor.hpp

@@ -64,7 +64,6 @@ class edge_descriptor final {
         return this->_vertices;
     }
 
-    // TODO: add tests
     [[nodiscard]] gl_attr_force_inline const types::homogeneous_pair<types::id_type> incident_vertex_ids() const {
         return std::make_pair(this->_vertices.first.id(), this->_vertices.second.id());
     }

include/gl/graph.hpp

@@ -9,6 +9,7 @@
 #include "impl/impl_tags.hpp"
 #include "io/stream_options_manipulator.hpp"
 #include "types/iterator_range.hpp"
+#include "views.hpp"
 
 #include <set>
 
@@ -83,10 +84,10 @@ class graph final {
     [[nodiscard]] gl_attr_force_inline auto vertices() const
     requires(not type_traits::is_default_properties_type_v<vertex_properties_type>)
     {
-        return std::views::enumerate(this->_vertex_properties)
-             | std::views::transform([](const auto& vertex_data) {
-                   const auto& [id, properties_ptr] = vertex_data;
-                   return vertex_descriptor{static_cast<types::id_type>(id), *properties_ptr};
+        return this->_vertex_properties | std::views::enumerate
+             | std::views::transform([](const auto& x) {
+                   const auto& [id, ptr] = x;
+                   return vertex_descriptor{static_cast<types::id_type>(id), *ptr};
                });
     }
 
@@ -123,7 +124,6 @@ class graph final {
         if constexpr (type_traits::is_default_properties_type_v<vertex_properties_type>)
             return vertex_descriptor{new_vertex_id};
         else {
-            // ensure a properties object is created for the new vertex
             this->_vertex_properties.push_back(std::make_unique<vertex_properties_type>());
             return vertex_descriptor{new_vertex_id, *this->_vertex_properties.back()};
         }
@@ -259,6 +259,12 @@ class graph final {
         return this->_impl.degree_map();
     }
 
+    [[nodiscard]] gl_attr_force_inline auto vertex_properties_map() const noexcept
+    requires(not type_traits::is_default_properties_type_v<vertex_properties_type>)
+    {
+        return views::deref(this->_vertex_properties);
+    }
+
     // --- edge methods ---
 
     // clang-format off
@@ -514,7 +520,6 @@ class graph final {
         this->_n_vertices--;
 
         // update vertex ids in edges
-        // TODO: add tests
         for (auto id : this->vertex_ids()) {
             for (auto& edge : this->_impl.adjacent_edges(id)) {
                 edge._vertices.first._id -= (edge._vertices.first._id > vertex_id);

include/gl/types/properties.hpp

@@ -37,7 +37,7 @@ class name_property
 
     name_property() = default;
 
-    name_property(std::string_view name) : _name(name) {}
+    name_property(const std::string_view name) : _name(name) {}
 
     name_property(const name_property&) = default;
     name_property(name_property&&) = default;
@@ -51,6 +51,11 @@ class name_property
     virtual ~name_property() = default;
 #endif
 
+    name_property& operator=(const std::string_view name) {
+        this->_name = name;
+        return *this;
+    }
+
     // clang-format off
     // gl_attr_force_inline misplacement
 
@@ -63,6 +68,14 @@ class name_property
     [[nodiscard]] bool operator==(const name_property&) const = default;
     [[nodiscard]] auto operator<=>(const name_property&) const = default;
 
+    [[nodiscard]] bool operator==(const std::string_view name) const {
+        return this->_name == name;
+    }
+
+    [[nodiscard]] auto operator<=>(const std::string_view name) const {
+        return this->_name <=> name;
+    }
+
     friend std::ostream& operator<<(std::ostream& os, const name_property& property) {
         os << std::quoted(property._name);
         return os;

include/gl/views.hpp

@@ -0,0 +1,11 @@
+// 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.
+
+#pragma once
+
+namespace gl::views {
+
+inline constexpr auto deref = std::views::transform([](auto&& p) -> decltype(auto) { return *p; });
+
+} // namespace gl::views

task.md

@@ -7,8 +7,6 @@
 
 #include <doctest.h>
 
-#include <print>
-
 namespace gl_testing {
 
 TEST_SUITE_BEGIN("test_alg_coloring");

tests/source/gl/test_alg_coloring.cpp

@@ -885,6 +885,30 @@ TEST_CASE_TEMPLATE_INSTANTIATE(
     gl::matrix_graph_traits<gl::undirected_t> // undirected adjacency matrix
 );
 
-TEST_SUITE_END(); // test_graph
+TEST_CASE_TEMPLATE_DEFINE(
+    "vertex_properties_map() should return a correct map", TraitsType, vp_graph_traits_template
+) {
+    using sut_type = gl::graph<TraitsType>;
+
+    sut_type sut{constants::n_elements};
+
+    for (auto vertex : sut.vertices())
+        vertex.properties() = std::format("vertex_{}", vertex.id());
+
+    auto map = sut.vertex_properties_map();
+    CHECK(map.size() == constants::n_elements);
+    for (auto [id, property] : std::views::zip(sut.vertex_ids(), map)) {
+        CHECK_EQ(property, std::format("vertex_{}", id));
+        CHECK_EQ(map[id], std::format("vertex_{}", id));
+    }
+}
+
+TEST_CASE_TEMPLATE_INSTANTIATE(
+    vp_graph_traits_template,
+    gl::list_graph_traits<gl::directed_t, gl::types::name_property>, // directed adjacency list
+    gl::list_graph_traits<gl::undirected_t, gl::types::name_property>, // undirected adjacency list
+    gl::matrix_graph_traits<gl::directed_t, gl::types::name_property>, // directed adjacency matrix
+    gl::matrix_graph_traits<gl::undirected_t, gl::types::name_property> // undirected adjacency matrix
+);
 
 } // namespace gl_testing

tests/source/gl/test_graph.cpp

@@ -46,9 +46,9 @@ struct test_graph_file_io {
         // prepare vertex and edge properties
         std::size_t v_idx = 0, e_idx = 0;
         for (const auto& vertex : sut_out.vertices()) {
-            vertex.properties() = {std::format("vertex_{}", v_idx++)};
+            vertex.properties() = std::format("vertex_{}", v_idx++);
             for (const auto& edge : sut_out.adjacent_edges(vertex))
-                edge.properties() = {std::format("edge_{}", e_idx++)};
+                edge.properties() = std::format("edge_{}", e_idx++);
         }
     }
 

tests/source/gl/test_graph_file_io.cpp

@@ -28,9 +28,9 @@ struct test_directed_graph_io {
         // prepare vertex and edge properties
         std::size_t v_idx = 0, e_idx = 0;
         for (const auto& vertex : sut_out.vertices()) {
-            vertex.properties() = {std::format("vertex_{}", v_idx++)};
+            vertex.properties() = std::format("vertex_{}", v_idx++);
             for (const auto& edge : sut_out.adjacent_edges(vertex))
-                edge.properties() = {std::format("edge_{}", e_idx++)};
+                edge.properties() = std::format("edge_{}", e_idx++);
         }
     }
 
@@ -138,10 +138,10 @@ struct test_undirected_graph_io {
         // prepare vertex and edge properties
         std::size_t v_idx = 0, e_idx = 0;
         for (const auto& vertex : sut_out.vertices()) {
-            vertex.properties() = {std::format("vertex_{}", v_idx++)};
+            vertex.properties() = std::format("vertex_{}", v_idx++);
             for (const auto& edge : sut_out.adjacent_edges(vertex))
                 if (edge.first().id() == vertex.id())
-                    edge.properties() = {std::format("edge_{}", e_idx++)};
+                    edge.properties() = std::format("edge_{}", e_idx++);
         }
     }