From 573caff150494431eb2201d8f8e06b57e86ef26c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kirill=20M=C3=BCller?= Date: Sat, 27 May 2023 13:56:47 +0200 Subject: [PATCH 1/2] Rename merges to cluster_merges --- R/community.R | 2 +- src/rinterface_extra.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/R/community.R b/R/community.R index 021920036e9..f4473749e4b 100644 --- a/R/community.R +++ b/R/community.R @@ -1690,7 +1690,7 @@ cluster_leading_eigen <- function(graph, steps = -1, weights = NULL, res$algorithm <- "leading eigenvector" res$vcount <- vcount(graph) res$membership <- res$membership + 1 - res$merges <- res$merges + 1 + res$cluster_merges <- res$cluster_merges + 1 res$history <- res$history + 1 class(res) <- "communities" res diff --git a/src/rinterface_extra.c b/src/rinterface_extra.c index 98707f12eb8..ded23fd6c6e 100644 --- a/src/rinterface_extra.c +++ b/src/rinterface_extra.c @@ -2560,7 +2560,7 @@ static void *R_igraph_altrep_from(SEXP vec, Rboolean writeable) { R_igraph_status_handler("Materializing 'from' vector.\n", NULL); SEXP xp=Rf_findVar(Rf_install("igraph"), R_altrep_data1(vec)); igraph_t *g=(igraph_t*)(R_ExternalPtrAddr(xp)); - + long int no_of_edges=igraph_ecount(g); data=NEW_NUMERIC(no_of_edges); memcpy(REAL(data), g->from.stor_begin, sizeof(igraph_real_t)*(size_t) no_of_edges); @@ -2577,7 +2577,7 @@ static void *R_igraph_altrep_to(SEXP vec, Rboolean writeable) { SEXP xp=Rf_findVar(Rf_install("igraph"), R_altrep_data1(vec)); igraph_t *g=(igraph_t*)(R_ExternalPtrAddr(xp)); - + long int no_of_edges=igraph_ecount(g); data=NEW_NUMERIC(no_of_edges); memcpy(REAL(data), g->to.stor_begin, sizeof(igraph_real_t)*(size_t) no_of_edges); @@ -8431,7 +8431,7 @@ SEXP R_igraph_community_leading_eigenvector(SEXP graph, SEXP steps, SET_VECTOR_ELT(result, 4, eigenvalues); SET_VECTOR_ELT(result, 5, eigenvectors); SET_VECTOR_ELT(result, 6, history); - SET_STRING_ELT(names, 0, Rf_mkChar("merges")); + SET_STRING_ELT(names, 0, Rf_mkChar("cluster_merges")); SET_STRING_ELT(names, 1, Rf_mkChar("membership")); SET_STRING_ELT(names, 2, Rf_mkChar("options")); SET_STRING_ELT(names, 3, Rf_mkChar("modularity")); From 05741cdb782d3dacd32fbf75a1913e253c5d8cb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kirill=20M=C3=BCller?= Date: Sat, 27 May 2023 16:22:01 +0200 Subject: [PATCH 2/2] Use dot --- R/community.R | 2 +- src/rinterface_extra.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/R/community.R b/R/community.R index f4473749e4b..43b15197759 100644 --- a/R/community.R +++ b/R/community.R @@ -1690,7 +1690,7 @@ cluster_leading_eigen <- function(graph, steps = -1, weights = NULL, res$algorithm <- "leading eigenvector" res$vcount <- vcount(graph) res$membership <- res$membership + 1 - res$cluster_merges <- res$cluster_merges + 1 + res$cluster.merges <- res$cluster.merges + 1 res$history <- res$history + 1 class(res) <- "communities" res diff --git a/src/rinterface_extra.c b/src/rinterface_extra.c index ded23fd6c6e..351314ce19d 100644 --- a/src/rinterface_extra.c +++ b/src/rinterface_extra.c @@ -8431,7 +8431,7 @@ SEXP R_igraph_community_leading_eigenvector(SEXP graph, SEXP steps, SET_VECTOR_ELT(result, 4, eigenvalues); SET_VECTOR_ELT(result, 5, eigenvectors); SET_VECTOR_ELT(result, 6, history); - SET_STRING_ELT(names, 0, Rf_mkChar("cluster_merges")); + SET_STRING_ELT(names, 0, Rf_mkChar("cluster.merges")); SET_STRING_ELT(names, 1, Rf_mkChar("membership")); SET_STRING_ELT(names, 2, Rf_mkChar("options")); SET_STRING_ELT(names, 3, Rf_mkChar("modularity"));