Skip to content

chore: R_SEXP_to_igraph() and R_SEXP_to_igraph_copy() get igraph_t object from external pointer #865

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.

Sign up for GitHub

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

Merged
krlmlr merged 2 commits into from
Jul 4, 2023
Merged

chore: R_SEXP_to_igraph() and R_SEXP_to_igraph_copy() get igraph_t object from external pointer #865

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bf212b9
use external pointer
Antonov548 Jul 2, 2023
6501314
Unclear
krlmlr Jul 4, 2023
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
54 changes: 3 additions & 51 deletions src/rinterface_extra.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2884,26 +2884,6 @@ void R_igraph_get_to(SEXP graph, igraph_vector_t* to) {
*to = pgraph->to;
}

void R_igraph_get_oi(SEXP graph, igraph_vector_t* oi) {
igraph_t *pgraph=R_igraph_get_pointer(graph);
*oi = pgraph->oi;
}

void R_igraph_get_ii(SEXP graph, igraph_vector_t* ii) {
igraph_t *pgraph=R_igraph_get_pointer(graph);
*ii = pgraph->ii;
}

void R_igraph_get_os(SEXP graph, igraph_vector_t* os) {
igraph_t *pgraph=R_igraph_get_pointer(graph);
*os = pgraph->os;
}

void R_igraph_get_is(SEXP graph, igraph_vector_t* is) {
igraph_t *pgraph=R_igraph_get_pointer(graph);
*is = pgraph->is;
}

SEXP R_igraph_to_SEXP(const igraph_t *graph) {

SEXP result;
Expand Down Expand Up @@ -3529,15 +3509,7 @@ int R_igraph_SEXP_to_array3_copy(SEXP rval, igraph_array3_t *a) {
}

int R_SEXP_to_igraph(SEXP graph, igraph_t *res) {

res->n=R_igraph_get_n(graph);
res->directed=R_igraph_get_directed(graph);
R_igraph_get_from(graph, &res->from);
R_igraph_get_to(graph, &res->to);
R_igraph_get_oi(graph, &res->oi);
R_igraph_get_ii(graph, &res->ii);
R_igraph_get_os(graph, &res->os);
R_igraph_get_is(graph, &res->is);
*res = *R_igraph_get_pointer(graph);

/* attributes */
res->attr=VECTOR_ELT(graph, igraph_t_idx_attr);
Expand All @@ -3546,30 +3518,10 @@ int R_SEXP_to_igraph(SEXP graph, igraph_t *res) {
}

int R_SEXP_to_igraph_copy(SEXP graph, igraph_t *res) {

res->n=R_igraph_get_n(graph);
res->directed=R_igraph_get_directed(graph);

igraph_vector_t from;
R_igraph_get_from(graph, &from);
igraph_vector_copy(&res->from, &from);
igraph_vector_t to;
R_igraph_get_to(graph, &to);
igraph_vector_copy(&res->to, &to);
igraph_vector_t oi;
R_igraph_get_oi(graph, &oi);
igraph_vector_copy(&res->oi, &oi);
igraph_vector_t ii;
R_igraph_get_ii(graph, &ii);
igraph_vector_copy(&res->ii, &ii);
igraph_vector_t os;
R_igraph_get_os(graph, &os);
igraph_vector_copy(&res->os, &os);
igraph_vector_t is;
R_igraph_get_is(graph, &is);
igraph_vector_copy(&res->is, &is);
igraph_copy(res, R_igraph_get_pointer(graph));

/* attributes */
/* FIXME: Why is this necessary? */
res->attr=VECTOR_ELT(graph, igraph_t_idx_attr);

return 0;
Expand Down