From 8efc2a52cbd0a5a87e39d829ca61b36b3b41015f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kirill=20M=C3=BCller?= Date: Sun, 5 Jan 2025 21:25:52 +0100 Subject: [PATCH] vendor: Update vendored sources to igraph/igraph@4b208d877de74a730e8707e94ebad5318cf308ae fix: mark some optional weight parameters as OPTIONAL in functions.yaml --- src/rinterface.c | 2 +- src/vendor/cigraph/interfaces/functions.yaml | 10 +++++----- src/vendor/igraph_version.h | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/rinterface.c b/src/rinterface.c index cae9418875..4420ef7ff4 100644 --- a/src/rinterface.c +++ b/src/rinterface.c @@ -2381,7 +2381,7 @@ SEXP R_igraph_get_all_shortest_paths_dijkstra(SEXP graph, SEXP from, SEXP to, SE if (!Rf_isNull(weights)) { R_SEXP_to_vector(weights, &c_weights); } c_mode = (igraph_neimode_t) Rf_asInteger(mode); /* Call igraph */ - IGRAPH_R_CHECK(igraph_get_all_shortest_paths_dijkstra(&c_graph, &c_vertices, &c_edges, &c_nrgeo, c_from, c_to, (Rf_isNull(weights) ? 0 : &c_weights), c_mode)); + IGRAPH_R_CHECK(igraph_get_all_shortest_paths_dijkstra(&c_graph, &c_vertices, &c_edges, &c_nrgeo, c_from, c_to, (Rf_isNull(weights) ? 0 : (Rf_isNull(weights) ? 0 : &c_weights)), c_mode)); /* Convert output */ PROTECT(r_result=NEW_LIST(3)); diff --git a/src/vendor/cigraph/interfaces/functions.yaml b/src/vendor/cigraph/interfaces/functions.yaml index c8d640d0f4..b39e341342 100644 --- a/src/vendor/cigraph/interfaces/functions.yaml +++ b/src/vendor/cigraph/interfaces/functions.yaml @@ -522,13 +522,13 @@ igraph_get_all_shortest_paths: igraph_distances_dijkstra: PARAMS: |- GRAPH graph, OUT MATRIX res, VERTEX_SELECTOR from=ALL, - VERTEX_SELECTOR to=ALL, EDGEWEIGHTS weights, NEIMODE mode=OUT + VERTEX_SELECTOR to=ALL, OPTIONAL EDGEWEIGHTS weights, NEIMODE mode=OUT DEPS: from ON graph, to ON graph, weights ON graph igraph_distances_dijkstra_cutoff: PARAMS: |- GRAPH graph, OUT MATRIX res, VERTEX_SELECTOR from=ALL, - VERTEX_SELECTOR to=ALL, EDGEWEIGHTS weights, NEIMODE mode=OUT, REAL cutoff=-1 + VERTEX_SELECTOR to=ALL, OPTIONAL EDGEWEIGHTS weights, NEIMODE mode=OUT, REAL cutoff=-1 DEPS: from ON graph, to ON graph, weights ON graph igraph_get_shortest_paths_dijkstra: @@ -557,7 +557,7 @@ igraph_get_all_shortest_paths_dijkstra: PARAMS: |- GRAPH graph, OPTIONAL OUT VERTEXSET_LIST vertices, OPTIONAL OUT EDGESET_LIST edges, OPTIONAL OUT VECTOR_INT nrgeo, - VERTEX from, VERTEX_SELECTOR to=ALL, EDGEWEIGHTS weights, + VERTEX from, VERTEX_SELECTOR to=ALL, OPTIONAL EDGEWEIGHTS weights, NEIMODE mode=OUT DEPS: |- weights ON graph, from ON graph, to ON graph, vertices ON graph, edges ON graph @@ -565,13 +565,13 @@ igraph_get_all_shortest_paths_dijkstra: igraph_distances_bellman_ford: PARAMS: |- GRAPH graph, OUT MATRIX res, VERTEX_SELECTOR from=ALL, - VERTEX_SELECTOR to=ALL, EDGEWEIGHTS weights, NEIMODE mode=OUT + VERTEX_SELECTOR to=ALL, OPTIONAL EDGEWEIGHTS weights, NEIMODE mode=OUT DEPS: from ON graph, to ON graph, weights ON graph igraph_distances_johnson: PARAMS: |- GRAPH graph, OUT MATRIX res, VERTEX_SELECTOR from=ALL, - VERTEX_SELECTOR to=ALL, EDGEWEIGHTS weights + VERTEX_SELECTOR to=ALL, OPTIONAL EDGEWEIGHTS weights DEPS: from ON graph, to ON graph, weights ON graph igraph_distances_floyd_warshall: diff --git a/src/vendor/igraph_version.h b/src/vendor/igraph_version.h index 5d0c02046e..7059c0fd08 100644 --- a/src/vendor/igraph_version.h +++ b/src/vendor/igraph_version.h @@ -28,11 +28,11 @@ __BEGIN_DECLS -#define IGRAPH_VERSION "0.10.13-146-gd0616a433" +#define IGRAPH_VERSION "0.10.13-147-g4b208d877" #define IGRAPH_VERSION_MAJOR 0 #define IGRAPH_VERSION_MINOR 10 #define IGRAPH_VERSION_PATCH 13 -#define IGRAPH_VERSION_PRERELEASE "146-gd0616a433" +#define IGRAPH_VERSION_PRERELEASE "147-g4b208d877" IGRAPH_EXPORT void igraph_version(const char **version_string, int *major,