vertex and edge ostream operator refinement

Author: SpectraL519

include/gl/edge_descriptor.hpp

@@ -4,6 +4,7 @@
 
 #pragma once
 
+#include "gl/attributes/force_inline.hpp"
 #include "gl/constants.hpp"
 #include "gl/directional_tags.hpp"
 #include "gl/io/format.hpp"
@@ -160,44 +161,80 @@ class edge_descriptor final {
         return this->_properties.get();
     }
 
-    friend inline std::ostream& operator<<(std::ostream& os, const edge_descriptor& edge) {
-        edge._write(os);
-        return os;
+    friend gl_attr_force_inline std::ostream& operator<<(
+        std::ostream& os, const edge_descriptor& edge
+    ) {
+        return edge._write(os);
     }
 
 private:
-    void _write(std::ostream& os) const {
+    std::ostream& _write(std::ostream& os) const
+    requires std::same_as<directional_tag, undirected_t>
+    {
         using io::detail::option_bit;
 
         if constexpr (not traits::c_writable<properties_type>) {
-            this->_write_no_properties(os);
-            return;
+            return this->_write_no_properties(os);
         }
         else {
-            if (not io::is_option_set(os, option_bit::with_connection_properties)) {
-                this->_write_no_properties(os);
-                return;
-            }
+            if (not io::is_option_set(os, option_bit::with_connection_properties))
+                return this->_write_no_properties(os);
 
-            // TODO: print ID
             if (io::is_option_set(os, option_bit::verbose))
-                os << "[source: " << this->_vertices.first << ", target: " << this->_vertices.second
-                   << " | properties: " << this->_properties.get() << "]";
+                return os
+                    << "[id: " << this->_id << " | endpoints: {" << this->_vertices.first << ", "
+                    << this->_vertices.second << "} | " << this->_properties.get() << ']';
             else
-                os << "[" << this->_vertices.first << ", " << this->_vertices.second << " | "
-                   << this->_properties.get() << "]";
+                return os << '{' << this->_vertices.first << ", " << this->_vertices.second << "}["
+                          << this->_properties.get() << ']';
         }
     }
 
-    void _write_no_properties(std::ostream& os) const {
+    std::ostream& _write_no_properties(std::ostream& os) const
+    requires std::same_as<directional_tag, undirected_t>
+    {
+        using io::detail::option_bit;
+
+        if (io::is_option_set(os, option_bit::verbose))
+            return os << "[id: " << this->_id << " | endpoints: {" << this->_vertices.first << ", "
+                      << this->_vertices.second << "}]";
+        else
+            return os << '{' << this->_vertices.first << ", " << this->_vertices.second << '}';
+    }
+
+    std::ostream& _write(std::ostream& os) const
+    requires std::same_as<directional_tag, directed_t>
+    {
+        using io::detail::option_bit;
+
+        if constexpr (not traits::c_writable<properties_type>) {
+            return this->_write_no_properties(os);
+        }
+        else {
+            if (not io::is_option_set(os, option_bit::with_connection_properties))
+                return this->_write_no_properties(os);
+
+            if (io::is_option_set(os, option_bit::verbose))
+                return os
+                    << "[id: " << this->_id << " | source: " << this->_vertices.first
+                    << ", target: " << this->_vertices.second << " | " << this->_properties.get()
+                    << ']';
+            else
+                return os << '(' << this->_vertices.first << ", " << this->_vertices.second << ")["
+                          << this->_properties.get() << ']';
+        }
+    }
+
+    std::ostream& _write_no_properties(std::ostream& os) const
+    requires std::same_as<directional_tag, directed_t>
+    {
         using io::detail::option_bit;
 
-        // TODO: print ID
         if (io::is_option_set(os, option_bit::verbose))
-            os << "[source: " << this->_vertices.first << ", target: " << this->_vertices.first
-               << "]";
+            return os << "[id: " << this->_id << " | source: " << this->_vertices.first
+                      << ", target: " << this->_vertices.second << ']';
         else
-            os << "[" << this->_vertices.first << ", " << this->_vertices.second << "]";
+            return os << '(' << this->_vertices.first << ", " << this->_vertices.second << ')';
     }
 
     id_type _id;

include/gl/io/options.hpp

@@ -11,10 +11,10 @@ namespace gl::io {
 namespace detail {
 
 enum class option_bit : bit_position_type {
-    verbose = 0ul,
-    with_vertex_properties = 1ul,
-    with_connection_properties = 2ul,
-    specification_fmt = 3ul
+    verbose = 0u,
+    with_vertex_properties = 1u,
+    with_connection_properties = 2u,
+    specification_fmt = 3u
 };
 
 } // namespace detail

include/gl/vertex_descriptor.hpp

@@ -4,6 +4,7 @@
 
 #pragma once
 
+#include "gl/attributes/force_inline.hpp"
 #include "gl/constants.hpp"
 #include "gl/decl/graph_traits.hpp"
 #include "gl/io/options.hpp"
@@ -92,39 +93,37 @@ class vertex_descriptor final {
         return this->_properties.get();
     }
 
-    friend inline std::ostream& operator<<(std::ostream& os, const vertex_descriptor& vertex) {
-        vertex._write(os);
-        return os;
+    friend gl_attr_force_inline std::ostream& operator<<(
+        std::ostream& os, const vertex_descriptor& vertex
+    ) {
+        return vertex._write(os);
     }
 
 private:
-    void _write(std::ostream& os) const {
+    std::ostream& _write(std::ostream& os) const {
         using io::detail::option_bit;
 
         if constexpr (not traits::c_writable<properties_type>) {
-            this->_write_no_properties(os);
-            return;
+            return this->_write_no_properties(os);
         }
         else {
-            if (not io::is_option_set(os, option_bit::with_vertex_properties)) {
-                this->_write_no_properties(os);
-                return;
-            }
+            if (not io::is_option_set(os, option_bit::with_vertex_properties))
+                return this->_write_no_properties(os);
 
             if (io::is_option_set(os, option_bit::verbose))
-                os << "[id: " << this->_id << " | properties: " << this->_properties.get() << "]";
+                return os << "[id: " << this->_id << " | " << this->_properties.get() << ']';
             else
-                os << "[" << this->_id << " | " << this->_properties.get() << "]";
+                return os << this->_id << '[' << this->_properties.get() << ']';
         }
     }
 
-    void _write_no_properties(std::ostream& os) const {
+    std::ostream& _write_no_properties(std::ostream& os) const {
         using io::detail::option_bit;
 
         if (io::is_option_set(os, option_bit::verbose))
-            os << std::format("[id: {}]", this->_id);
+            return os << std::format("[id: {}]", this->_id);
         else
-            os << this->_id;
+            return os << this->_id;
     }
 
     id_type _id;