Skip to content

Commit 33c8781

Browse files
committed
update reticula and bind spans correctly
1 parent afc58d0 commit 33c8781

3 files changed

Lines changed: 29 additions & 15 deletions

File tree

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ include(FetchContent)
99
FetchContent_Declare(
1010
reticula
1111
GIT_REPOSITORY https://github.com/reticula-network/reticula.git
12-
GIT_TAG 3b55f7780fc8fbe91605a85b7b72dd7055131216)
12+
GIT_TAG 15b3ad5057c0e89ef6fb619677496f8d1a7e0992)
1313

1414
FetchContent_Declare(
1515
fmt

src/implicit_event_graphs.cpp

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,20 @@ struct declare_implicit_event_graph_class {
3636
"temporal_network"_a, "temporal_adjacency"_a,
3737
nb::call_guard<nb::gil_scoped_release>())
3838
.def("events_cause",
39-
&Net::events_cause,
40-
nb::call_guard<nb::gil_scoped_release>())
39+
[](const Net& self) {
40+
auto edges = self.events_cause();
41+
return std::vector<EdgeT>(edges.begin(), edges.end());
42+
}, nb::call_guard<nb::gil_scoped_release>())
4143
.def("events_effect",
42-
&Net::events_effect,
43-
nb::call_guard<nb::gil_scoped_release>())
44+
[](const Net& self) {
45+
auto edges = self.events_effect();
46+
return std::vector<EdgeT>(edges.begin(), edges.end());
47+
}, nb::call_guard<nb::gil_scoped_release>())
4448
.def("temporal_net_vertices",
45-
&Net::temporal_net_vertices,
46-
nb::call_guard<nb::gil_scoped_release>())
49+
[](const Net& self) {
50+
auto verts = self.temporal_net_vertices();
51+
return std::vector<typename Net::VertexType>(verts.begin(), verts.end());
52+
}, nb::call_guard<nb::gil_scoped_release>())
4753
.def("temporal_adjacency",
4854
&Net::temporal_adjacency,
4955
nb::call_guard<nb::gil_scoped_release>())

src/networks.cpp

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,17 +33,25 @@ struct declare_network_class {
3333
"edges"_a, "verts"_a,
3434
nb::call_guard<nb::gil_scoped_release>())
3535
.def("vertices",
36-
&Net::vertices,
37-
nb::call_guard<nb::gil_scoped_release>())
36+
[](const Net& self) {
37+
auto verts = self.vertices();
38+
return std::vector<typename Net::VertexType>(verts.begin(), verts.end());
39+
}, nb::call_guard<nb::gil_scoped_release>())
3840
.def("edges",
39-
&Net::edges,
40-
nb::call_guard<nb::gil_scoped_release>())
41+
[](const Net& self) {
42+
auto edges = self.edges();
43+
return std::vector<EdgeT>(edges.begin(), edges.end());
44+
}, nb::call_guard<nb::gil_scoped_release>())
4145
.def("edges_cause",
42-
&Net::edges_cause,
43-
nb::call_guard<nb::gil_scoped_release>())
46+
[](const Net& self) {
47+
auto edges = self.edges_cause();
48+
return std::vector<EdgeT>(edges.begin(), edges.end());
49+
}, nb::call_guard<nb::gil_scoped_release>())
4450
.def("edges_effect",
45-
&Net::edges_effect,
46-
nb::call_guard<nb::gil_scoped_release>())
51+
[](const Net& self) {
52+
auto edges = self.edges_effect();
53+
return std::vector<EdgeT>(edges.begin(), edges.end());
54+
}, nb::call_guard<nb::gil_scoped_release>())
4755
.def("incident_edges",
4856
&Net::incident_edges,
4957
"vert"_a,

0 commit comments

Comments
 (0)