update to the span vertlist system

Author: arashbm

CMakeLists.txt

@@ -9,7 +9,7 @@ include(FetchContent)
 FetchContent_Declare(
   reticula
   GIT_REPOSITORY https://github.com/reticula-network/reticula.git
-  GIT_TAG 7498b6a481b4e09f28bb75c4f3b1c6ea7921cf76)
+  GIT_TAG 3b55f7780fc8fbe91605a85b7b72dd7055131216)
 
 FetchContent_Declare(
   fmt

src/common_edge_properties.hpp

@@ -4,7 +4,6 @@
 #include "nanobind/operators.h"
 #include "type_str/scalars.hpp"
 #include "type_str/edges.hpp"
-#include "type_utils.hpp"
 #include "type_handles.hpp"
 
 namespace nb = nanobind;
@@ -17,15 +16,18 @@ nb::class_<EdgeT> define_basic_edge_concept(nb::module_& m) {
   cls.def(nb::init<const EdgeT&>(),
         "edge"_a,
         nb::call_guard<nb::gil_scoped_release>())
-    .def("mutated_verts",
-        &EdgeT::mutated_verts,
-        nb::call_guard<nb::gil_scoped_release>())
-    .def("mutator_verts",
-        &EdgeT::mutator_verts,
-        nb::call_guard<nb::gil_scoped_release>())
-    .def("incident_verts",
-        &EdgeT::incident_verts,
-        nb::call_guard<nb::gil_scoped_release>())
+    .def("mutated_verts", [](const EdgeT& self) {
+      auto mv = self.mutated_verts();
+      return std::vector<typename EdgeT::VertexType>(mv.begin(), mv.end());
+    }, nb::call_guard<nb::gil_scoped_release>())
+    .def("mutator_verts", [](const EdgeT& self) {
+      auto mv = self.mutator_verts();
+      return std::vector<typename EdgeT::VertexType>(mv.begin(), mv.end());
+    }, nb::call_guard<nb::gil_scoped_release>())
+    .def("incident_verts", [](const EdgeT& self) {
+      auto iv = self.incident_verts();
+      return std::vector<typename EdgeT::VertexType>(iv.begin(), iv.end());
+    }, nb::call_guard<nb::gil_scoped_release>())
     .def("is_incident",
         &EdgeT::is_incident,
         "vert"_a,

src/static_edges.cpp

@@ -5,8 +5,6 @@
 
 #include <reticula/static_edges.hpp>
 
-#include "type_str/scalars.hpp"
-#include "type_str/edges.hpp"
 #include "type_utils.hpp"
 #include "common_edge_properties.hpp"
 

src/static_hyperedges.cpp

@@ -5,8 +5,6 @@
 
 #include <reticula/static_hyperedges.hpp>
 
-#include "type_str/scalars.hpp"
-#include "type_str/edges.hpp"
 #include "type_utils.hpp"
 #include "common_edge_properties.hpp"
 
@@ -35,12 +33,14 @@ struct declare_static_hyperedges {
         new (edge) reticula::directed_hyperedge<VertT>{
           std::get<0>(t), std::get<1>(t)};
       }, "tuple"_a, nb::call_guard<nb::gil_scoped_release>())
-      .def("heads",
-          &reticula::directed_hyperedge<VertT>::heads,
-          nb::call_guard<nb::gil_scoped_release>())
-      .def("tails",
-          &reticula::directed_hyperedge<VertT>::tails,
-          nb::call_guard<nb::gil_scoped_release>());
+      .def("heads", [](const reticula::directed_hyperedge<VertT>& self) {
+        auto heads = self.heads();
+        return std::vector<VertT>(heads.begin(), heads.end());
+      }, nb::call_guard<nb::gil_scoped_release>())
+      .def("tails", [](const reticula::directed_hyperedge<VertT>& self) {
+        auto tails = self.tails();
+        return std::vector<VertT>(tails.begin(), tails.end());
+      }, nb::call_guard<nb::gil_scoped_release>());
 
     nb::implicitly_convertible<
       std::pair<std::vector<VertT>, std::vector<VertT>>,

src/temporal_edges.cpp

@@ -4,8 +4,6 @@
 
 #include <reticula/temporal_edges.hpp>
 
-#include "type_str/scalars.hpp"
-#include "type_str/edges.hpp"
 #include "type_utils.hpp"
 #include "common_edge_properties.hpp"
 

src/temporal_hyperedges.cpp

@@ -4,8 +4,6 @@
 
 #include <reticula/temporal_hyperedges.hpp>
 
-#include "type_str/scalars.hpp"
-#include "type_str/edges.hpp"
 #include "type_utils.hpp"
 #include "common_edge_properties.hpp"
 
@@ -44,12 +42,16 @@ struct declare_temporal_hyperedges {
            new (edge) reticula::directed_temporal_hyperedge<VertT, TimeT>{
                   std::get<0>(t), std::get<1>(t), std::get<2>(t)};
         }, "tuple"_a, nb::call_guard<nb::gil_scoped_release>())
-      .def("heads",
-          &reticula::directed_temporal_hyperedge<VertT, TimeT>::heads,
-          nb::call_guard<nb::gil_scoped_release>())
-      .def("tails",
-          &reticula::directed_temporal_hyperedge<VertT, TimeT>::tails,
-          nb::call_guard<nb::gil_scoped_release>());
+      .def("heads", [](
+                const reticula::directed_temporal_hyperedge<VertT, TimeT>& self) {
+           auto heads = self.heads();
+           return std::vector<VertT>(heads.begin(), heads.end());
+        }, nb::call_guard<nb::gil_scoped_release>())
+      .def("tails", [](
+                const reticula::directed_temporal_hyperedge<VertT, TimeT>& self) {
+           auto tails = self.tails();
+           return std::vector<VertT>(tails.begin(), tails.end());
+        }, nb::call_guard<nb::gil_scoped_release>());
 
     nb::implicitly_convertible<
       std::tuple<std::vector<VertT>, std::vector<VertT>, TimeT>,
@@ -67,12 +69,16 @@ struct declare_temporal_hyperedges {
                           std::get<0>(t), std::get<1>(t),
                           std::get<2>(t), std::get<3>(t)};
         }, "tuple"_a, nb::call_guard<nb::gil_scoped_release>())
-      .def("heads",
-          &reticula::directed_delayed_temporal_hyperedge<VertT, TimeT>::heads,
-          nb::call_guard<nb::gil_scoped_release>())
-      .def("tails",
-          &reticula::directed_delayed_temporal_hyperedge<VertT, TimeT>::tails,
-          nb::call_guard<nb::gil_scoped_release>());
+      .def("heads", [](
+                const reticula::directed_delayed_temporal_hyperedge<VertT, TimeT>& self) {
+           auto heads = self.heads();
+           return std::vector<VertT>(heads.begin(), heads.end());
+        }, nb::call_guard<nb::gil_scoped_release>())
+      .def("tails", [](
+                const reticula::directed_delayed_temporal_hyperedge<VertT, TimeT>& self) {
+           auto tails = self.tails();
+           return std::vector<VertT>(tails.begin(), tails.end());
+        }, nb::call_guard<nb::gil_scoped_release>());
 
     nb::implicitly_convertible<
       std::tuple<std::vector<VertT>, std::vector<VertT>, TimeT, TimeT>,