fixed errors

Author: SpectraL519

include/hgl/directional_tags.hpp

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include <type_traits>
+#include "types/type_traits.hpp"
 
 namespace hgl {
 
@@ -16,4 +16,11 @@ struct bf_directed_t {
     using type = std::type_identity_t<bf_directed_t>;
 };
 
+namespace type_traits {
+
+template <typename T>
+concept c_hypergraph_directional_tag = c_one_of<T, undirected_t, bf_directed_t>;
+
+} // namespace type_traits
+
 } // namespace hgl

include/hgl/hypergraph_elements.hpp

@@ -6,7 +6,6 @@
 
 #include "constants.hpp"
 #include "gl/vertex_descriptor.hpp"
-#include "hyperedge_tags.hpp"
 #include "types/type_traits.hpp"
 #include "types/types.hpp"
 
@@ -29,8 +28,6 @@ class hyperedge_descriptor final {
         types::empty_properties,
         properties_type&>;
 
-    friend directional_tag;
-
     hyperedge_descriptor() {
         *this = hyperedge_descriptor::invalid();
     }
@@ -95,9 +92,7 @@ class hyperedge_descriptor final {
         std::reference_wrapper<properties_type>> _properties;
 };
 
-template <
-    type_traits::c_hypergraph_directional_tag DirectionalTag = undirected_t,
-    type_traits::c_properties Properties = types::empty_properties>
-using hyperedge = hyperedge_descriptor<DirectionalTag, Properties>;
+template <type_traits::c_properties Properties = types::empty_properties>
+using hyperedge = hyperedge_descriptor<Properties>;
 
 } // namespace hgl

include/hgl/hypergraph_traits.hpp

@@ -4,56 +4,48 @@
 
 #pragma once
 
+#include "directional_tags.hpp"
 #include "hypergraph_elements.hpp"
 #include "impl/impl_tags.hpp"
 
 namespace hgl {
 
 template <
-    type_traits::c_hypergraph_directional_tag HyperedgeDirectionalTag = undirected_t,
+    type_traits::c_hypergraph_directional_tag DirectionalTag = undirected_t,
     type_traits::c_properties VertexProperties = types::empty_properties,
     type_traits::c_properties HyperedgeProperties = types::empty_properties,
     type_traits::c_hypergraph_impl_tag ImplTag = impl::hyperedge_list_t>
 struct hypergraph_traits {
     using vertex_type = vertex_descriptor<VertexProperties>;
     using vertex_properties_type = typename vertex_type::properties_type;
 
-    using hyperedge_type = hyperedge_descriptor<HyperedgeDirectionalTag, HyperedgeProperties>;
-    using hyperedge_directional_tag = typename hyperedge_type::directional_tag;
+    using hyperedge_type = hyperedge_descriptor<HyperedgeProperties>;
     using hyperedge_properties_type = typename hyperedge_type::properties_type;
 
+    using directional_tag = DirectionalTag;
     using implementation_tag = ImplTag;
 };
 
 template <
-    type_traits::c_hypergraph_directional_tag HyperedgeDirectionalTag = undirected_t,
+    type_traits::c_hypergraph_directional_tag DirectionalTag = undirected_t,
     type_traits::c_properties VertexProperties = types::empty_properties,
     type_traits::c_properties HyperedgeProperties = types::empty_properties>
-using hyperedge_list_hg_traits = hypergraph_traits<
-    HyperedgeDirectionalTag,
-    VertexProperties,
-    HyperedgeProperties,
-    impl::hyperedge_list_t>;
+using hyperedge_list_hg_traits =
+    hypergraph_traits<DirectionalTag, VertexProperties, HyperedgeProperties, impl::hyperedge_list_t>;
 
 template <
-    type_traits::c_hypergraph_directional_tag HyperedgeDirectionalTag = undirected_t,
+    type_traits::c_hypergraph_directional_tag DirectionalTag = undirected_t,
     type_traits::c_properties VertexProperties = types::empty_properties,
     type_traits::c_properties HyperedgeProperties = types::empty_properties>
-using adjacency_list_hg_traits = hypergraph_traits<
-    HyperedgeDirectionalTag,
-    VertexProperties,
-    HyperedgeProperties,
-    impl::adjacency_list_t>;
+using adjacency_list_hg_traits =
+    hypergraph_traits<DirectionalTag, VertexProperties, HyperedgeProperties, impl::adjacency_list_t>;
 
 template <
-    type_traits::c_hypergraph_directional_tag HyperedgeDirectionalTag = undirected_t,
+    type_traits::c_hypergraph_directional_tag DirectionalTag = undirected_t,
     type_traits::c_properties VertexProperties = types::empty_properties,
     type_traits::c_properties HyperedgeProperties = types::empty_properties>
-using incidence_matrix_hg_traits = hypergraph_traits<
-    HyperedgeDirectionalTag,
-    VertexProperties,
-    HyperedgeProperties,
-    impl::incidence_matrix_t>;
+using incidence_matrix_hg_traits =
+    hypergraph_traits<DirectionalTag, VertexProperties, HyperedgeProperties, impl::incidence_matrix_t>;
 
 template <
     type_traits::c_properties VertexProperties = types::empty_properties,

tests/source/hgl/test_hypergraph.cpp

@@ -17,7 +17,7 @@ template <
     gl::type_traits::c_instantiation_of<hgl::hypergraph_traits> HypergraphTraits,
     gl::type_traits::c_properties VertexProperties>
 using add_vertex_property = hgl::hypergraph_traits<
-    typename HypergraphTraits::hyperedge_directional_tag,
+    typename HypergraphTraits::directional_tag,
     VertexProperties,
     typename HypergraphTraits::hyperedge_properties_type,
     typename HypergraphTraits::implementation_tag>;
@@ -26,7 +26,7 @@ template <
     gl::type_traits::c_instantiation_of<gl::graph_traits> HypergraphTraits,
     gl::type_traits::c_properties HyperedgeProperties>
 using add_edge_property = hgl::hypergraph_traits<
-    typename HypergraphTraits::edge_directional_tag,
+    typename HypergraphTraits::directional_tag,
     typename HypergraphTraits::vertex_properties_type,
     HyperedgeProperties,
     typename HypergraphTraits::implementation_tag>;

tests/source/hgl/test_hypergraph_elements.cpp

@@ -1,6 +1,8 @@
-#include "hgl/hypergraph_elements.hpp"
+#include "testing/hgl/constants.hpp"
+#include "testing/hgl/types.hpp"
 
 #include <doctest.h>
+#include <hgl/hypergraph_elements.hpp>
 
 namespace hgl_testing {
 
@@ -28,7 +30,7 @@ TEST_CASE_FIXTURE(
 TEST_CASE_FIXTURE(test_hyperedge_descriptor, "hyperedge should be valid only if it has a valid id") {
     CHECK(he1);
     CHECK(he2.is_valid());
-    CHECK_FALSE(HyperedgeType::invalid());
+    CHECK_FALSE(sut_type::invalid());
 }
 
 TEST_CASE_FIXTURE(test_hyperedge_descriptor, "id() should return the id of the hyperedge") {
@@ -41,7 +43,23 @@ TEST_CASE_FIXTURE(test_hyperedge_descriptor, "hyperedge descriptors should be in
     CHECK_EQ(sut_type{}.id(), hgl::constants::invalid_id);
 }
 
-// TODO: properties tests
+TEST_CASE_FIXTURE(test_hyperedge_descriptor, "properties should be properly initialized") {
+    types::boolean_property property{constants::p_true};
+
+    const hgl::hyperedge<types::boolean_property> sut{id1, property};
+    CHECK_EQ(&sut.properties(), &property);
+}
+
+TEST_CASE("accessing properties should throw for an invalid hyperedge") {
+    using sut_type = hgl::hyperedge<types::boolean_property>;
+    types::boolean_property property{constants::p_true};
+
+    CHECK_THROWS_AS(static_cast<void>(sut_type::invalid().properties()), std::logic_error);
+    CHECK_THROWS_AS(
+        static_cast<void>(sut_type{hgl::constants::invalid_id, property}.properties()),
+        std::logic_error
+    );
+}
 
 TEST_SUITE_END(); // test_hypergraph_elements