gl io refactor done

Author: SpectraL519

include/gl/edge_descriptor.hpp

@@ -12,6 +12,8 @@
 #include "gl/types/core.hpp"
 #include "gl/vertex_descriptor.hpp"
 
+#include <format>
+
 namespace gl {
 
 template <

include/gl/graph.hpp

@@ -4,9 +4,11 @@
 
 #pragma once
 
+#include "gl/attributes/force_inline.hpp"
 #include "gl/constants.hpp"
 #include "gl/graph_traits.hpp"
 #include "gl/impl/impl_tags.hpp"
+#include "gl/io/graph_fmt_traits.hpp"
 #include "gl/io/options.hpp"
 #include "gl/io/stream_options_manipulator.hpp"
 #include "gl/util/ranges.hpp"
@@ -633,22 +635,17 @@ class graph final {
     friend std::ostream& operator<<(std::ostream& os, const graph& g) {
         using io::detail::option_bit;
 
-        if (io::is_option_set(os, option_bit::specification_fmt)) {
-            g._gsf_write(os);
-            return os;
-        }
+        if (io::is_option_set(os, option_bit::specification_fmt))
+            return g._gsf_write(os);
 
         if (io::is_option_set(os, option_bit::verbose))
-            g._verbose_write(os);
+            return g._verbose_write(os);
         else
-            g._concise_write(os);
-
-        return os;
+            return g._concise_write(os);
     }
 
-    friend inline std::istream& operator>>(std::istream& is, graph& g) {
-        g._gsf_read(is);
-        return is;
+    friend gl_attr_force_inline std::istream& operator>>(std::istream& is, graph& g) {
+        return g._gsf_read(is);
     }
 
     // --- friend declarations ---
@@ -663,6 +660,8 @@ class graph final {
     friend struct detail::to_impl;
 
 private:
+    using fmt_traits = io::detail::graph_fmt_traits<directional_tag>;
+
     graph(const graph& other)
     : _n_vertices{other._n_vertices}, _n_edges{other._n_edges}, _impl{other._impl} {
         // Deep copy vertex properties
@@ -682,11 +681,7 @@ class graph final {
         }
     }
 
-    [[nodiscard]] static constexpr std::string _directed_type_str() {
-        return traits::c_directed_edge<edge_type> ? "directed" : "undirected";
-    }
-
-    // --- graph element verification methods ---
+    // --- element validation ---
 
     gl_attr_force_inline void _verify_vertex_id(const id_type vertex_id) const {
         if (not this->has_vertex(vertex_id))
@@ -704,7 +699,7 @@ class graph final {
             ));
     }
 
-    // --- vertex methods ---
+    // --- vertex modifiers ---
 
     void _remove_vertex_impl(const id_type vertex_id) {
         const auto removed_edge_ids = this->_impl.remove_vertex(vertex_id);
@@ -721,35 +716,37 @@ class graph final {
         }
     }
 
-    // --- io methods ---
-
-    void _verbose_write(std::ostream& os) const {
-        os << std::format(
-            "type: {}\nnumber of vertices: {}\nnumber of edges: {}\nvertices:\n",
-            _directed_type_str(),
-            this->order(),
-            this->size()
-        );
+    // --- I/O utility ---
 
+    std::ostream& _verbose_write(std::ostream& os) const {
+        os << "type: " << fmt_traits::type << ", |V| = " << this->order()
+           << ", |E| = " << this->size() << '\n';
         for (const auto& vertex : this->vertices()) {
-            os << "- " << vertex << "\n  incident edges:\n";
+            os << "- " << vertex << "\n  " << fmt_traits::out_edges << ":\n";
             for (const auto& edge : this->out_edges(vertex.id()))
                 os << "\t- " << edge << '\n';
         }
+        return os;
     }
 
-    void _concise_write(std::ostream& os) const {
-        os << std::format("{} {} {}\n", _directed_type_str(), this->order(), this->size());
+    std::ostream& _concise_write(std::ostream& os) const {
+        using io::detail::option_bit;
 
-        for (const auto& vertex : this->vertices()) {
-            os << "- " << vertex << " :";
-            for (const auto& edge : this->out_edges(vertex.id()))
-                os << ' ' << edge;
+        for (const auto& src : this->vertices()) {
+            os << src << " :";
+            for (const auto& edge : this->out_edges(src.id())) {
+                os << ' ' << edge.other(src.id());
+                if constexpr (traits::c_writable<edge_properties_type>)
+                    if (io::is_option_set(os, option_bit::with_connection_properties))
+                        os << '[' << edge.properties() << ']';
+            }
             os << '\n';
         }
+
+        return os;
     }
 
-    void _gsf_write(std::ostream& os) const {
+    std::ostream& _gsf_write(std::ostream& os) const {
         using io::detail::option_bit;
 
         const bool with_vertex_properties =
@@ -767,12 +764,12 @@ class graph final {
             static_cast<int>(with_edge_properties)
         );
 
-        if constexpr (traits::c_writable<typename vertex_type::properties_type>)
+        if constexpr (traits::c_writable<vertex_properties_type>)
             if (with_vertex_properties)
                 for (const auto& vertex : this->vertices())
                     os << vertex.properties() << '\n';
 
-        if constexpr (traits::c_writable<typename edge_type::properties_type>) {
+        if constexpr (traits::c_writable<edge_properties_type>) {
             if (with_edge_properties) {
                 const auto print_out_edges = [this, &os](const id_type vertex_id) {
                     for (const auto& edge : this->out_edges(vertex_id)) {
@@ -786,7 +783,7 @@ class graph final {
                 for (const auto vertex_id : this->vertex_ids())
                     print_out_edges(vertex_id);
 
-                return;
+                return os;
             }
         }
 
@@ -800,16 +797,18 @@ class graph final {
 
         for (const auto vertex_id : this->vertex_ids())
             print_out_edges(vertex_id);
+
+        return os;
     }
 
-    void _gsf_read(std::istream& is) {
+    std::istream& _gsf_read(std::istream& is) {
         bool directed;
         is >> directed;
 
         if (directed != traits::c_directed_edge<edge_type>)
             throw std::ios_base::failure(std::format(
                 "Invalid graph specification: directional tag does not match - should be {}",
-                _directed_type_str()
+                fmt_traits::type
             ));
 
         // read initial graph parameters
@@ -866,6 +865,8 @@ class graph final {
                 this->add_edge(source_id, target_id);
             }
         }
+
+        return is;
     }
 
     size_type _n_vertices = 0uz;

include/gl/io.hpp

@@ -4,12 +4,5 @@
 
 #pragma once
 
-// clang-format off
-
-#include "gl/io/format.hpp"
-#include "gl/io/stream_options_manipulator.hpp"
-
-#include "gl/io/options.hpp"
 #include "gl/io/graph_fio.hpp"
-
-// clang-format on
+#include "gl/io/options.hpp"

include/gl/io/graph_fmt_traits.hpp

@@ -0,0 +1,28 @@
+// 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
+
+#include "gl/directional_tags.hpp"
+
+#include <string_view>
+
+namespace gl::io::detail {
+
+template <typename DirectionalTag>
+struct graph_fmt_traits;
+
+template <>
+struct graph_fmt_traits<directed_t> {
+    static constexpr std::string_view type = "directed";
+    static constexpr std::string_view out_edges = "outgoing edges";
+};
+
+template <>
+struct graph_fmt_traits<undirected_t> {
+    static constexpr std::string_view type = "undirected";
+    static constexpr std::string_view out_edges = "incident edges";
+};
+
+} // namespace gl::io::detail

include/gl/vertex_descriptor.hpp

@@ -13,7 +13,6 @@
 #include "gl/types/properties.hpp"
 
 #include <compare>
-#include <format>
 
 namespace gl {
 
@@ -121,7 +120,7 @@ class vertex_descriptor final {
         using io::detail::option_bit;
 
         if (io::is_option_set(os, option_bit::verbose))
-            return os << std::format("[id: {}]", this->_id);
+            return os << "[id: " << this->_id << ']';
         else
             return os << this->_id;
     }

tests/source/gl/test_stream_options_manipulator.cpp

@@ -1,9 +1,8 @@
+#include "doctest.h"
 #include "testing/gl/constants.hpp"
 
 #include <gl/io/stream_options_manipulator.hpp>
 
-#include <doctest.h>
-
 #include <sstream>
 
 namespace gl_testing {