Merge pull request #61 from ropensci/fix/deprecated-igraph-clusters

Fix/replace igraph clusters with components
ropensci · Apr 14, 2024 · 625d6d3 · 625d6d3
2 parents 2edd03c + d80980b
commit 625d6d3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/R/group_lines.R b/R/group_lines.R
@@ -174,7 +174,7 @@ group_lines <-
       }
       dimnames(inter) <- list(sfLines[[id]], sfLines[[id]])
       g <- igraph::graph_from_adjacency_matrix(inter)
-      ovr <- igraph::clusters(g)$membership
+      ovr <- igraph::components(g)$membership
       out <- data.table::data.table(names(ovr),
                                     unlist(ovr))
       data.table::setnames(out, c('ID', 'group'))
@@ -237,7 +237,7 @@ group_lines <-
         }
         dimnames(inter) <- list(lns[[id]], lns[[id]])
         g <- igraph::graph_from_adjacency_matrix(inter)
-        ovr <- igraph::clusters(g)$membership
+        ovr <- igraph::components(g)$membership
         ovrDT <- data.table::data.table(ID = names(ovr),
                                         group = unlist(ovr))
       } else {
@@ -291,7 +291,7 @@ group_lines <-
             }
             dimnames(inter) <- list(lns[[id]], lns[[id]])
             g <- igraph::graph_from_adjacency_matrix(inter)
-            ovr <- igraph::clusters(g)$membership
+            ovr <- igraph::components(g)$membership
             out <- data.table::data.table(names(ovr),
                                           unlist(ovr))
             data.table::setnames(out, c(..id, 'withinGroup'))

diff --git a/R/group_polys.R b/R/group_polys.R
@@ -156,7 +156,7 @@ group_polys <-
         inter <- sf::st_intersects(sfPolys, sfPolys, sparse = FALSE)
         dimnames(inter) <- list(sfPolys[[id]], sfPolys[[id]])
         g <- igraph::graph_from_adjacency_matrix(inter)
-        ovr <- igraph::clusters(g)$membership
+        ovr <- igraph::components(g)$membership
         out <- data.table::data.table(names(ovr),
                                       as.integer(unlist(ovr)))
         data.table::setnames(out, c(id, 'group'))
@@ -244,7 +244,7 @@ group_polys <-
               inter <- sf::st_intersects(sfPolys, sfPolys, sparse = FALSE)
               dimnames(inter) <- list(sfPolys[[..id]], sfPolys[[..id]])
               g <- igraph::graph_from_adjacency_matrix(inter)
-              ovr <- igraph::clusters(g)$membership
+              ovr <- igraph::components(g)$membership
               out <- data.table::data.table(names(ovr),
                                             as.integer(unlist(ovr)))
               data.table::setnames(out, c(id, 'withinGroup'))

diff --git a/R/group_pts.R b/R/group_pts.R
@@ -182,7 +182,7 @@ group_pts <- function(DT = NULL,
       method = 'euclidean'))
     graphAdj <-
       igraph::graph_from_adjacency_matrix(distMatrix <= threshold)
-    igraph::clusters(graphAdj)$membership
+    igraph::components(graphAdj)$membership
   },
   by = c(splitBy, timegroup), .SDcols = c(coords, id)]
   DT[, group := .GRP,