Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

vendor: Update vendored sources to igraph/igraph@2ab6b87947187a0b046fa3cbb10a30ec370843aa #1670

Merged
merged 1 commit into from
Feb 2, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions src/rinterface.c
Original file line number Diff line number Diff line change
Expand Up @@ -11106,10 +11106,8 @@ SEXP R_igraph_eulerian_cycle(SEXP graph) {
R_SEXP_to_igraph(graph, &c_graph);
IGRAPH_R_CHECK(igraph_vector_int_init(&c_edge_res, 0));
IGRAPH_FINALLY(igraph_vector_int_destroy, &c_edge_res);
if (0 != igraph_vector_int_init(&c_vertex_res, 0)) {
igraph_error("", __FILE__, __LINE__, IGRAPH_ENOMEM);
}
IGRAPH_FINALLY_PV(igraph_vector_int_destroy, &c_vertex_res);
IGRAPH_R_CHECK(igraph_vector_int_init(&c_vertex_res, 0));
IGRAPH_FINALLY(igraph_vector_int_destroy, &c_vertex_res);
/* Call igraph */
IGRAPH_R_CHECK(igraph_eulerian_cycle(&c_graph, &c_edge_res, &c_vertex_res));

Expand Down
2 changes: 1 addition & 1 deletion src/vendor/cigraph/interfaces/functions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2563,7 +2563,7 @@ igraph_eulerian_path:
DEPS: edge_res ON graph, vertex_res ON graph

igraph_eulerian_cycle:
PARAMS: GRAPH graph, OPTIONAL OUT EDGE_INDICES edge_res, OPTIONAL OUT VERTEX_INDICES_PV vertex_res
PARAMS: GRAPH graph, OPTIONAL OUT EDGE_INDICES edge_res, OPTIONAL OUT VERTEX_INDICES vertex_res
DEPS: edge_res ON graph, vertex_res ON graph

#######################################
Expand Down
7 changes: 0 additions & 7 deletions src/vendor/cigraph/interfaces/types.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -157,13 +157,6 @@ VERTEX_INDICES:
CTYPE: igraph_vector_int_t
FLAGS: BY_REF

# Temporary, for https://github.com/igraph/rigraph/pull/1630
# We should call the `_PV` versions for all types in the future.
VERTEX_INDICES_PV:
# An integer vector containing vertex indices.
CTYPE: igraph_vector_int_t
FLAGS: BY_REF

VERTEX_INDEX_PAIRS:
# An integer vector containing pairs of vertex indices, in a flattened
# representation
Expand Down
4 changes: 2 additions & 2 deletions src/vendor/igraph_version.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@

__BEGIN_DECLS

#define IGRAPH_VERSION "0.10.15-47-g521624378"
#define IGRAPH_VERSION "0.10.15-48-g2ab6b8794"
#define IGRAPH_VERSION_MAJOR 0
#define IGRAPH_VERSION_MINOR 10
#define IGRAPH_VERSION_PATCH 15
#define IGRAPH_VERSION_PRERELEASE "47-g521624378"
#define IGRAPH_VERSION_PRERELEASE "48-g2ab6b8794"

IGRAPH_EXPORT void igraph_version(const char **version_string,
int *major,
Expand Down