Skip to content
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
183 changes: 135 additions & 48 deletions R/aaa-auto.R
Original file line number Diff line number Diff line change
Expand Up @@ -14199,14 +14199,18 @@ cliques_callback_closure_impl <- function(
ensure_igraph(graph)
min_size <- as.numeric(min_size)
max_size <- as.numeric(max_size)
if (!is.function(callback)) {
cli::cli_abort("{.arg callback} must be a function")
}
callback_wrapped <- function(...) {
tryCatch(
callback(...),
error = function(e) e
)
if (!is.null(callback)) {
if (!is.function(callback)) {
cli::cli_abort("{.arg callback} must be a function")
}
callback_wrapped <- function(...) {
tryCatch(
callback(...),
error = function(e) e
)
}
} else {
callback_wrapped <- NULL
}


Expand All @@ -14233,14 +14237,18 @@ maximal_cliques_callback_closure_impl <- function(
ensure_igraph(graph)
min_size <- as.numeric(min_size)
max_size <- as.numeric(max_size)
if (!is.function(callback)) {
cli::cli_abort("{.arg callback} must be a function")
}
callback_wrapped <- function(...) {
tryCatch(
callback(...),
error = function(e) e
)
if (!is.null(callback)) {
if (!is.function(callback)) {
cli::cli_abort("{.arg callback} must be a function")
}
callback_wrapped <- function(...) {
tryCatch(
callback(...),
error = function(e) e
)
}
} else {
callback_wrapped <- NULL
}


Expand All @@ -14257,6 +14265,69 @@ maximal_cliques_callback_closure_impl <- function(
res
}

community_leading_eigenvector_callback_closure_impl <- function(
graph,
weights = NULL,
membership = NULL,
steps = -1,
options = arpack_defaults(),
start = FALSE,
callback = NULL,
extra = NULL,
env = parent.frame(),
env_arp = environment(igraph.i.levc.arp)
) {
# Argument checks
ensure_igraph(graph)
if (is.null(weights) && "weight" %in% edge_attr_names(graph)) {
weights <- E(graph)$weight
}
if (!is.null(weights) && !all(is.na(weights))) {
weights <- as.numeric(weights)
} else {
weights <- NULL
}
if (!is.null(membership)) {
membership <- as.numeric(membership)
}
steps <- as.numeric(steps)
options <- modify_list(arpack_defaults(), options)
start <- as.logical(start)
if (!is.null(callback)) {
if (!is.function(callback)) {
cli::cli_abort("{.arg callback} must be a function")
}
callback_wrapped <- function(...) {
tryCatch(
callback(...),
error = function(e) e
)
}
} else {
callback_wrapped <- NULL
}


on.exit(.Call(R_igraph_finalizer))
# Function call
res <- .Call(
R_igraph_community_leading_eigenvector_callback_closure,
graph,
weights,
membership,
steps,
options,
start,
callback_wrapped,
extra,
env,
env_arp
)

class(res) <- "igraph.eigenc"
res
}

get_isomorphisms_vf2_callback_closure_impl <- function(
graph1,
graph2,
Expand Down Expand Up @@ -14309,14 +14380,18 @@ get_isomorphisms_vf2_callback_closure_impl <- function(
if (!is.null(edge_color2)) {
edge_color2 <- as.numeric(edge_color2) - 1
}
if (!is.function(callback)) {
cli::cli_abort("{.arg callback} must be a function")
}
callback_wrapped <- function(...) {
tryCatch(
callback(...),
error = function(e) e
)
if (!is.null(callback)) {
if (!is.function(callback)) {
cli::cli_abort("{.arg callback} must be a function")
}
callback_wrapped <- function(...) {
tryCatch(
callback(...),
error = function(e) e
)
}
} else {
callback_wrapped <- NULL
}


Expand Down Expand Up @@ -14388,14 +14463,18 @@ get_subisomorphisms_vf2_callback_closure_impl <- function(
if (!is.null(edge_color2)) {
edge_color2 <- as.numeric(edge_color2) - 1
}
if (!is.function(callback)) {
cli::cli_abort("{.arg callback} must be a function")
}
callback_wrapped <- function(...) {
tryCatch(
callback(...),
error = function(e) e
)
if (!is.null(callback)) {
if (!is.function(callback)) {
cli::cli_abort("{.arg callback} must be a function")
}
callback_wrapped <- function(...) {
tryCatch(
callback(...),
error = function(e) e
)
}
} else {
callback_wrapped <- NULL
}


Expand Down Expand Up @@ -14433,14 +14512,18 @@ simple_cycles_callback_closure_impl <- function(
)
min_cycle_length <- as.numeric(min_cycle_length)
max_cycle_length <- as.numeric(max_cycle_length)
if (!is.function(callback)) {
cli::cli_abort("{.arg callback} must be a function")
}
callback_wrapped <- function(...) {
tryCatch(
callback(...),
error = function(e) e
)
if (!is.null(callback)) {
if (!is.function(callback)) {
cli::cli_abort("{.arg callback} must be a function")
}
callback_wrapped <- function(...) {
tryCatch(
callback(...),
error = function(e) e
)
}
} else {
callback_wrapped <- NULL
}


Expand Down Expand Up @@ -14470,14 +14553,18 @@ motifs_randesu_callback_closure_impl <- function(
if (!is.null(cut_prob)) {
cut_prob <- as.numeric(cut_prob)
}
if (!is.function(callback)) {
cli::cli_abort("{.arg callback} must be a function")
}
callback_wrapped <- function(...) {
tryCatch(
callback(...),
error = function(e) e
)
if (!is.null(callback)) {
if (!is.function(callback)) {
cli::cli_abort("{.arg callback} must be a function")
}
callback_wrapped <- function(...) {
tryCatch(
callback(...),
error = function(e) e
)
}
} else {
callback_wrapped <- NULL
}


Expand Down
31 changes: 16 additions & 15 deletions R/community.R
Original file line number Diff line number Diff line change
Expand Up @@ -2100,7 +2100,7 @@ cluster_fast_greedy <- function(
igraph.i.levc.arp <- function(externalP, externalE) {
f <- function(v) {
v <- as.numeric(v)
.Call(Rx_igraph_i_levc_arp, externalP, externalE, v)
.Call(R_igraph_levc_arpack_multiplier, externalP, externalE, v)
}
f
}
Expand Down Expand Up @@ -2251,26 +2251,27 @@ cluster_leading_eigen <- function(
} else {
weights <- NULL
}
if (!is.null(start)) {

# Convert start membership to 0-based indexing and determine start flag
start_flag <- !is.null(start)
if (start_flag) {
start <- as.numeric(start) - 1
}

options <- modify_list(arpack_defaults(), options)

on.exit(.Call(Rx_igraph_finalizer))
# Function call
res <- .Call(
Rx_igraph_community_leading_eigenvector,
graph,
steps,
weights,
options,
start,
callback,
extra,
env,
environment(igraph.i.levc.arp)
res <- community_leading_eigenvector_callback_closure_impl(
graph = graph,
weights = weights,
membership = start,
steps = steps,
options = options,
start = start_flag,
callback = callback,
extra = extra,
env = env
)

if (igraph_opt("add.vertex.names") && is_named(graph)) {
res$names <- V(graph)$name
}
Expand Down
Loading
Loading