Skip to content

Commit 33de49e

Browse files
committed
Merge branch 'main' into next
2 parents 9a86bfe + 3d3344d commit 33de49e

28 files changed

+360
-360
lines changed

R/attributes.R

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ graph_attr <- function(graph, name) {
328328

329329
check_string(name)
330330

331-
.Call(R_igraph_mybracket2, graph, igraph_t_idx_attr, igraph_attr_idx_graph)[[
331+
.Call(Rx_igraph_mybracket2, graph, igraph_t_idx_attr, igraph_attr_idx_graph)[[
332332
name
333333
]]
334334
}
@@ -402,7 +402,7 @@ set_graph_attr <- function(graph, name, value) {
402402
graph.attributes <- function(graph) {
403403
ensure_igraph(graph)
404404
.Call(
405-
R_igraph_mybracket2_copy,
405+
Rx_igraph_mybracket2_copy,
406406
graph,
407407
igraph_t_idx_attr,
408408
igraph_attr_idx_graph
@@ -418,7 +418,7 @@ graph.attributes <- function(graph) {
418418
}
419419

420420
.Call(
421-
R_igraph_mybracket2_set,
421+
Rx_igraph_mybracket2_set,
422422
graph,
423423
igraph_t_idx_attr,
424424
igraph_attr_idx_graph,
@@ -460,7 +460,7 @@ vertex_attr <- function(graph, name, index = V(graph)) {
460460
check_string(name)
461461
myattr <-
462462
.Call(
463-
R_igraph_mybracket2,
463+
Rx_igraph_mybracket2,
464464
graph,
465465
igraph_t_idx_attr,
466466
igraph_attr_idx_vertex
@@ -610,7 +610,7 @@ i_set_vertex_attr <- function(
610610
}
611611

612612
vattrs <- .Call(
613-
R_igraph_mybracket2,
613+
Rx_igraph_mybracket2,
614614
graph,
615615
igraph_t_idx_attr,
616616
igraph_attr_idx_vertex
@@ -644,7 +644,7 @@ i_set_vertex_attr <- function(
644644
}
645645

646646
.Call(
647-
R_igraph_mybracket2_set,
647+
Rx_igraph_mybracket2_set,
648648
graph,
649649
igraph_t_idx_attr,
650650
igraph_attr_idx_vertex,
@@ -661,7 +661,7 @@ vertex.attributes <- function(graph, index = V(graph)) {
661661
}
662662

663663
res <- .Call(
664-
R_igraph_mybracket2_copy,
664+
Rx_igraph_mybracket2_copy,
665665
graph,
666666
igraph_t_idx_attr,
667667
igraph_attr_idx_vertex
@@ -721,7 +721,7 @@ set_value_at <- function(value, idx, length_out) {
721721
}
722722

723723
.Call(
724-
R_igraph_mybracket2_set,
724+
Rx_igraph_mybracket2_set,
725725
graph,
726726
igraph_t_idx_attr,
727727
igraph_attr_idx_vertex,
@@ -762,7 +762,7 @@ edge_attr <- function(graph, name, index = E(graph)) {
762762
} else {
763763
check_string(name)
764764
myattr <- .Call(
765-
R_igraph_mybracket2,
765+
Rx_igraph_mybracket2,
766766
graph,
767767
igraph_t_idx_attr,
768768
igraph_attr_idx_edge
@@ -866,7 +866,7 @@ i_set_edge_attr <- function(
866866
}
867867

868868
eattrs <- .Call(
869-
R_igraph_mybracket2,
869+
Rx_igraph_mybracket2,
870870
graph,
871871
igraph_t_idx_attr,
872872
igraph_attr_idx_edge
@@ -897,7 +897,7 @@ i_set_edge_attr <- function(
897897
}
898898

899899
.Call(
900-
R_igraph_mybracket2_set,
900+
Rx_igraph_mybracket2_set,
901901
graph,
902902
igraph_t_idx_attr,
903903
igraph_attr_idx_edge,
@@ -914,7 +914,7 @@ edge.attributes <- function(graph, index = E(graph)) {
914914
}
915915

916916
res <- .Call(
917-
R_igraph_mybracket2_copy,
917+
Rx_igraph_mybracket2_copy,
918918
graph,
919919
igraph_t_idx_attr,
920920
igraph_attr_idx_edge
@@ -964,7 +964,7 @@ edge.attributes <- function(graph, index = E(graph)) {
964964
}
965965

966966
.Call(
967-
R_igraph_mybracket2_set,
967+
Rx_igraph_mybracket2_set,
968968
graph,
969969
igraph_t_idx_attr,
970970
igraph_attr_idx_edge,
@@ -987,7 +987,7 @@ edge.attributes <- function(graph, index = E(graph)) {
987987
graph_attr_names <- function(graph) {
988988
ensure_igraph(graph)
989989
res <- .Call(
990-
R_igraph_mybracket2_names,
990+
Rx_igraph_mybracket2_names,
991991
graph,
992992
igraph_t_idx_attr,
993993
igraph_attr_idx_graph
@@ -1016,7 +1016,7 @@ vertex_attr_names <- function(graph) {
10161016
ensure_igraph(graph)
10171017

10181018
res <- .Call(
1019-
R_igraph_mybracket2_names,
1019+
Rx_igraph_mybracket2_names,
10201020
graph,
10211021
igraph_t_idx_attr,
10221022
igraph_attr_idx_vertex
@@ -1044,7 +1044,7 @@ vertex_attr_names <- function(graph) {
10441044
edge_attr_names <- function(graph) {
10451045
ensure_igraph(graph)
10461046
res <- .Call(
1047-
R_igraph_mybracket2_names,
1047+
Rx_igraph_mybracket2_names,
10481048
graph,
10491049
igraph_t_idx_attr,
10501050
igraph_attr_idx_edge
@@ -1078,15 +1078,15 @@ delete_graph_attr <- function(graph, name) {
10781078
}
10791079

10801080
gattr <- .Call(
1081-
R_igraph_mybracket2,
1081+
Rx_igraph_mybracket2,
10821082
graph,
10831083
igraph_t_idx_attr,
10841084
igraph_attr_idx_graph
10851085
)
10861086
gattr[[name]] <- NULL
10871087

10881088
.Call(
1089-
R_igraph_mybracket2_set,
1089+
Rx_igraph_mybracket2_set,
10901090
graph,
10911091
igraph_t_idx_attr,
10921092
igraph_attr_idx_graph,
@@ -1118,15 +1118,15 @@ delete_vertex_attr <- function(graph, name) {
11181118
}
11191119

11201120
vattr <- .Call(
1121-
R_igraph_mybracket2,
1121+
Rx_igraph_mybracket2,
11221122
graph,
11231123
igraph_t_idx_attr,
11241124
igraph_attr_idx_vertex
11251125
)
11261126
vattr[[name]] <- NULL
11271127

11281128
.Call(
1129-
R_igraph_mybracket2_set,
1129+
Rx_igraph_mybracket2_set,
11301130
graph,
11311131
igraph_t_idx_attr,
11321132
igraph_attr_idx_vertex,
@@ -1158,15 +1158,15 @@ delete_edge_attr <- function(graph, name) {
11581158
}
11591159

11601160
eattr <- .Call(
1161-
R_igraph_mybracket2,
1161+
Rx_igraph_mybracket2,
11621162
graph,
11631163
igraph_t_idx_attr,
11641164
igraph_attr_idx_edge
11651165
)
11661166
eattr[[name]] <- NULL
11671167

11681168
.Call(
1169-
R_igraph_mybracket2_set,
1169+
Rx_igraph_mybracket2_set,
11701170
graph,
11711171
igraph_t_idx_attr,
11721172
igraph_attr_idx_edge,

R/centrality.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1023,7 +1023,7 @@ arpack <- function(
10231023
}
10241024

10251025
on.exit(.Call(R_igraph_finalizer))
1026-
res <- .Call(R_igraph_arpack, func, extra, options, env, sym)
1026+
res <- .Call(Rx_igraph_arpack, func, extra, options, env, sym)
10271027

10281028
if (complex) {
10291029
rew <- arpack.unpack.complex(
@@ -1061,7 +1061,7 @@ arpack.unpack.complex <- function(vectors, values, nev) {
10611061

10621062
on.exit(.Call(R_igraph_finalizer))
10631063
# Function call
1064-
res <- .Call(R_igraph_arpack_unpack_complex, vectors, values, nev)
1064+
res <- .Call(Rx_igraph_arpack_unpack_complex, vectors, values, nev)
10651065

10661066
res
10671067
}

R/cliques.R

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@ count_max_cliques <- function(graph, min = NULL, max = NULL, subset = NULL) {
354354

355355
on.exit(.Call(R_igraph_finalizer))
356356
# Function call
357-
res <- .Call(R_igraph_maximal_cliques_count, graph, subset, min, max)
357+
res <- .Call(Rx_igraph_maximal_cliques_count, graph, subset, min, max)
358358

359359
res
360360
}
@@ -551,7 +551,7 @@ largest_ivs <- function(graph) {
551551
ensure_igraph(graph)
552552

553553
on.exit(.Call(R_igraph_finalizer))
554-
res <- .Call(R_igraph_largest_independent_vertex_sets, graph)
554+
res <- .Call(Rx_igraph_largest_independent_vertex_sets, graph)
555555
res <- lapply(res, `+`, 1)
556556

557557
if (igraph_opt("return.vs.es")) {
@@ -567,7 +567,7 @@ max_ivs <- function(graph) {
567567
ensure_igraph(graph)
568568

569569
on.exit(.Call(R_igraph_finalizer))
570-
res <- .Call(R_igraph_maximal_independent_vertex_sets, graph)
570+
res <- .Call(Rx_igraph_maximal_independent_vertex_sets, graph)
571571
res <- lapply(res, `+`, 1)
572572

573573
if (igraph_opt("return.vs.es")) {
@@ -598,7 +598,7 @@ ivs_size <- function(graph) {
598598
ensure_igraph(graph)
599599

600600
on.exit(.Call(R_igraph_finalizer))
601-
.Call(R_igraph_independence_number, graph)
601+
.Call(Rx_igraph_independence_number, graph)
602602
}
603603

604604
#' @rdname ivs

R/cocitation.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ cocitation <- function(graph, v = V(graph)) {
5858

5959
v <- as_igraph_vs(graph, v)
6060
on.exit(.Call(R_igraph_finalizer))
61-
res <- .Call(R_igraph_cocitation, graph, v - 1)
61+
res <- .Call(Rx_igraph_cocitation, graph, v - 1)
6262
if (igraph_opt("add.vertex.names") && is_named(graph)) {
6363
rownames(res) <- vertex_attr(graph, "name", v)
6464
colnames(res) <- vertex_attr(graph, "name")
@@ -73,7 +73,7 @@ bibcoupling <- function(graph, v = V(graph)) {
7373

7474
v <- as_igraph_vs(graph, v)
7575
on.exit(.Call(R_igraph_finalizer))
76-
res <- .Call(R_igraph_bibcoupling, graph, v - 1)
76+
res <- .Call(Rx_igraph_bibcoupling, graph, v - 1)
7777
if (igraph_opt("add.vertex.names") && is_named(graph)) {
7878
rownames(res) <- vertex_attr(graph, "name", v)
7979
colnames(res) <- vertex_attr(graph, "name")

R/cohesive.blocks.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ cohesive_blocks <- function(graph, labels = TRUE) {
357357

358358
on.exit(.Call(R_igraph_finalizer))
359359
# Function call
360-
res <- .Call(R_igraph_cohesive_blocks, graph)
360+
res <- .Call(Rx_igraph_cohesive_blocks, graph)
361361
class(res) <- "cohesiveBlocks"
362362
if (labels && "name" %in% vertex_attr_names(graph)) {
363363
res$labels <- V(graph)$name

R/community.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1326,7 +1326,7 @@ community.to.membership2 <- function(merges, vcount, steps) {
13261326
mode(vcount) <- "numeric"
13271327
mode(steps) <- "numeric"
13281328
on.exit(.Call(R_igraph_finalizer))
1329-
res <- .Call(R_igraph_community_to_membership2, merges - 1, vcount, steps)
1329+
res <- .Call(Rx_igraph_community_to_membership2, merges - 1, vcount, steps)
13301330
res + 1
13311331
}
13321332

@@ -2121,7 +2121,7 @@ cluster_fast_greedy <- function(
21212121
igraph.i.levc.arp <- function(externalP, externalE) {
21222122
f <- function(v) {
21232123
v <- as.numeric(v)
2124-
.Call(R_igraph_i_levc_arp, externalP, externalE, v)
2124+
.Call(Rx_igraph_i_levc_arp, externalP, externalE, v)
21252125
}
21262126
f
21272127
}

R/conversion.R

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -489,7 +489,7 @@ as_adj <- function(
489489
as_edgelist <- function(graph, names = TRUE) {
490490
ensure_igraph(graph)
491491
on.exit(.Call(R_igraph_finalizer))
492-
res <- matrix(.Call(R_igraph_get_edgelist, graph, TRUE), ncol = 2)
492+
res <- matrix(.Call(Rx_igraph_get_edgelist, graph, TRUE), ncol = 2)
493493
res <- res + 1
494494
if (names && "name" %in% vertex_attr_names(graph)) {
495495
res <- matrix(V(graph)$name[res], ncol = 2)
@@ -699,7 +699,7 @@ as_adj_list <- function(
699699

700700
multiple <- if (multiple) 1 else 0
701701
on.exit(.Call(R_igraph_finalizer))
702-
res <- .Call(R_igraph_get_adjlist, graph, mode, loops, multiple)
702+
res <- .Call(Rx_igraph_get_adjlist, graph, mode, loops, multiple)
703703
res <- lapply(res, `+`, 1)
704704
if (igraph_opt("return.vs.es")) {
705705
res <- lapply(res, unsafe_create_vs, graph = graph, verts = V(graph))
@@ -729,7 +729,7 @@ as_adj_edge_list <- function(
729729
}
730730

731731
on.exit(.Call(R_igraph_finalizer))
732-
res <- .Call(R_igraph_get_adjedgelist, graph, mode, loops)
732+
res <- .Call(Rx_igraph_get_adjedgelist, graph, mode, loops)
733733
res <- lapply(res, function(.x) E(graph)[.x + 1])
734734
if (is_named(graph)) {
735735
names(res) <- V(graph)$name
@@ -1193,7 +1193,7 @@ as_data_frame <- function(x, what = c("edges", "vertices", "both")) {
11931193

11941194
if (what %in% c("vertices", "both")) {
11951195
ver <- .Call(
1196-
R_igraph_mybracket2,
1196+
Rx_igraph_mybracket2,
11971197
x,
11981198
igraph_t_idx_attr,
11991199
igraph_attr_idx_vertex
@@ -1211,7 +1211,7 @@ as_data_frame <- function(x, what = c("edges", "vertices", "both")) {
12111211
el <- as_edgelist(x)
12121212
edg <- c(
12131213
list(from = el[, 1], to = el[, 2]),
1214-
.Call(R_igraph_mybracket2, x, igraph_t_idx_attr, igraph_attr_idx_edge)
1214+
.Call(Rx_igraph_mybracket2, x, igraph_t_idx_attr, igraph_attr_idx_edge)
12151215
)
12161216
class(edg) <- "data.frame"
12171217
rownames(edg) <- seq_len(ecount(x))
@@ -1318,7 +1318,7 @@ as_long_data_frame <- function(graph) {
13181318
ensure_igraph(graph)
13191319

13201320
ver <- .Call(
1321-
R_igraph_mybracket2,
1321+
Rx_igraph_mybracket2,
13221322
graph,
13231323
igraph_t_idx_attr,
13241324
igraph_attr_idx_vertex
@@ -1335,7 +1335,7 @@ as_long_data_frame <- function(graph) {
13351335
edg <- c(
13361336
list(from = el[, 1]),
13371337
list(to = el[, 2]),
1338-
.Call(R_igraph_mybracket2, graph, igraph_t_idx_attr, igraph_attr_idx_edge)
1338+
.Call(Rx_igraph_mybracket2, graph, igraph_t_idx_attr, igraph_attr_idx_edge)
13391339
)
13401340
class(edg) <- "data.frame"
13411341
rownames(edg) <- seq_len(ecount(graph))

0 commit comments

Comments
 (0)