aligned includes in hgl, replaced directional-specific list/matrix classes with common template classes parametrized with a directional tag

Author: SpectraL519

include/hgl/directional_tags.hpp

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "types/type_traits.hpp"
+#include "hgl/types/type_traits.hpp"
 
 namespace hgl {
 

include/hgl/hypergraph.hpp

@@ -4,9 +4,9 @@
 
 #pragma once
 
-#include "constants.hpp"
-#include "hypergraph_traits.hpp"
-#include "util.hpp"
+#include "hgl/constants.hpp"
+#include "hgl/hypergraph_traits.hpp"
+#include "hgl/util.hpp"
 
 #include <memory>
 #include <set>

include/hgl/hypergraph_elements.hpp

@@ -4,10 +4,10 @@
 
 #pragma once
 
-#include "constants.hpp"
 #include "gl/vertex_descriptor.hpp"
-#include "types/type_traits.hpp"
-#include "types/types.hpp"
+#include "hgl/constants.hpp"
+#include "hgl/types/type_traits.hpp"
+#include "hgl/types/types.hpp"
 
 namespace hgl {
 

include/hgl/hypergraph_traits.hpp

@@ -4,10 +4,10 @@
 
 #pragma once
 
-#include "directional_tags.hpp"
-#include "hypergraph_elements.hpp"
-#include "impl/impl_tags.hpp"
-#include "impl/layout_tags.hpp"
+#include "hgl/directional_tags.hpp"
+#include "hgl/hypergraph_elements.hpp"
+#include "hgl/impl/impl_tags.hpp"
+#include "hgl/impl/layout_tags.hpp"
 
 namespace hgl {
 

include/hgl/impl/impl_tags.hpp

@@ -4,9 +4,10 @@
 
 #pragma once
 
+#include "hgl/directional_tags.hpp"
+#include "hgl/impl/layout_tags.hpp"
 #include "hgl/types/type_traits.hpp"
 #include "hgl/types/types.hpp"
-#include "layout_tags.hpp"
 
 namespace hgl {
 

include/hgl/impl/incidence_list.hpp

@@ -4,8 +4,9 @@
 
 #pragma once
 
+#include "hgl/directional_tags.hpp"
+#include "hgl/impl/layout_tags.hpp"
 #include "hgl/types/types.hpp"
-#include "layout_tags.hpp"
 
 #include <algorithm>
 #include <ranges>
@@ -19,23 +20,28 @@ struct test_incidence_list;
 
 namespace hgl::impl {
 
+template <
+    type_traits::c_hypergraph_directional_tag DirectionalTag,
+    type_traits::c_hypergraph_layout_tag LayoutTag>
+class incidence_list;
+
 template <type_traits::c_hypergraph_layout_tag LayoutTag>
-class undirected_incidence_list final {
+class incidence_list<hgl::undirected_t, LayoutTag> final {
 public:
     using layout_tag = LayoutTag;
 
-    undirected_incidence_list(const undirected_incidence_list&) = delete;
-    undirected_incidence_list& operator=(const undirected_incidence_list&) = delete;
+    incidence_list(const incidence_list&) = delete;
+    incidence_list& operator=(const incidence_list&) = delete;
 
-    undirected_incidence_list() = default;
+    incidence_list() = default;
 
-    undirected_incidence_list(const types::size_type n_vertices, const types::size_type n_hyperedges)
+    incidence_list(const types::size_type n_vertices, const types::size_type n_hyperedges)
     : _major_storage{layout_tag::major(n_vertices, n_hyperedges)} {}
 
-    undirected_incidence_list(undirected_incidence_list&&) = default;
-    undirected_incidence_list& operator=(undirected_incidence_list&&) = default;
+    incidence_list(incidence_list&&) = default;
+    incidence_list& operator=(incidence_list&&) = default;
 
-    ~undirected_incidence_list() = default;
+    ~incidence_list() = default;
 
     // --- vertex methods ---
 

include/hgl/impl/incidence_matrix.hpp

@@ -4,8 +4,9 @@
 
 #pragma once
 
+#include "hgl/directional_tags.hpp"
+#include "hgl/impl/layout_tags.hpp"
 #include "hgl/types/types.hpp"
-#include "layout_tags.hpp"
 
 #include <algorithm>
 #include <ranges>
@@ -19,28 +20,31 @@ struct test_incidence_matrix;
 
 namespace hgl::impl {
 
+template <
+    type_traits::c_hypergraph_directional_tag DirectionalTag,
+    type_traits::c_hypergraph_layout_tag LayoutTag>
+class incidence_matrix;
+
 template <type_traits::c_hypergraph_layout_tag LayoutTag>
-class undirected_incidence_matrix final {
+class incidence_matrix<hgl::undirected_t, LayoutTag> final {
 public:
     using layout_tag = LayoutTag;
 
-    undirected_incidence_matrix(const undirected_incidence_matrix&) = delete;
-    undirected_incidence_matrix& operator=(const undirected_incidence_matrix&) = delete;
+    incidence_matrix(const incidence_matrix&) = delete;
+    incidence_matrix& operator=(const incidence_matrix&) = delete;
 
-    undirected_incidence_matrix() = default;
+    incidence_matrix() = default;
 
-    undirected_incidence_matrix(
-        const types::size_type n_vertices, const types::size_type n_hyperedges
-    )
+    incidence_matrix(const types::size_type n_vertices, const types::size_type n_hyperedges)
     : _matrix_row_size{layout_tag::minor(n_vertices, n_hyperedges)},
       _matrix(
           layout_tag::major(n_vertices, n_hyperedges), matrix_row_type(_matrix_row_size, false)
       ) {}
 
-    undirected_incidence_matrix(undirected_incidence_matrix&&) = default;
-    undirected_incidence_matrix& operator=(undirected_incidence_matrix&&) = default;
+    incidence_matrix(incidence_matrix&&) = default;
+    incidence_matrix& operator=(incidence_matrix&&) = default;
 
-    ~undirected_incidence_matrix() = default;
+    ~incidence_matrix() = default;
 
     // --- vertex methods ---
 

tests/source/hgl/test_incidence_list.cpp

@@ -18,7 +18,7 @@ struct test_incidence_list {
 };
 
 struct test_undirected_vertex_major_incidence_list : public test_incidence_list {
-    using sut_type = hgl::impl::undirected_incidence_list<hgl::impl::vertex_major_t>;
+    using sut_type = hgl::impl::incidence_list<hgl::undirected_t, hgl::impl::vertex_major_t>;
 };
 
 TEST_CASE_FIXTURE(
@@ -250,7 +250,7 @@ TEST_CASE_FIXTURE(test_undirected_vertex_major_incidence_list, "add_hyperedges s
 }
 
 struct test_undirected_hyperedge_major_incidence_list : public test_incidence_list {
-    using sut_type = hgl::impl::undirected_incidence_list<hgl::impl::hyperedge_major_t>;
+    using sut_type = hgl::impl::incidence_list<hgl::undirected_t, hgl::impl::hyperedge_major_t>;
 };
 
 TEST_CASE_FIXTURE(

tests/source/hgl/test_incidence_matrix.cpp

@@ -19,7 +19,7 @@ struct test_incidence_matrix {
 };
 
 struct test_undirected_vertex_major_incidence_matrix : public test_incidence_matrix {
-    using sut_type = hgl::impl::undirected_incidence_matrix<hgl::impl::vertex_major_t>;
+    using sut_type = hgl::impl::incidence_matrix<hgl::undirected_t, hgl::impl::vertex_major_t>;
 };
 
 TEST_CASE_FIXTURE(
@@ -296,7 +296,7 @@ TEST_CASE_FIXTURE(
 }
 
 struct test_undirected_hyperedge_major_incidence_matrix : public test_incidence_matrix {
-    using sut_type = hgl::impl::undirected_incidence_matrix<hgl::impl::hyperedge_major_t>;
+    using sut_type = hgl::impl::incidence_matrix<hgl::undirected_t, hgl::impl::hyperedge_major_t>;
 };
 
 TEST_CASE_FIXTURE(