fix: bfs() no longer pads order with zeros with `igraph_options(r…

…eturn.vs.es = FALSE)` (#1124)
igraph · Jan 20, 2024 · ba56d83 · ba56d83
2 parents f425694 + 0c07f63
commit ba56d83
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 3 deletions.
diff --git a/R/interface.R b/R/interface.R
@@ -525,7 +525,8 @@ get.edge.ids <- function(
     multi = NULL) {
   ensure_igraph(graph)
 
-  if (lifecycle::is_present(multi)) {
+  # FIXME: Change to lifecycle::is_present() when using deprecated
+  if (!is.null(multi)) {
     if (isTRUE(multi)) {
       lifecycle::deprecate_stop("2.0.0", "get.edge.ids(multi = )")
     }

diff --git a/R/structural.properties.R b/R/structural.properties.R
@@ -2149,6 +2149,8 @@ bfs <- function(
     if (father) res$father <- create_vs(graph, res$father, na_ok = TRUE)
     if (pred) res$pred <- create_vs(graph, res$pred, na_ok = TRUE)
     if (succ) res$succ <- create_vs(graph, res$succ, na_ok = TRUE)
+  } else {
+    if (order) res$order <- res$order[res$order != 0]
   }
 
   if (igraph_opt("add.vertex.names") && is_named(graph)) {

diff --git a/man/get.edge.ids.Rd b/man/get.edge.ids.Rd
diff --git a/tests/testthat/test-graph.bfs.R b/tests/testthat/test-graph.bfs.R
@@ -128,3 +128,11 @@ test_that("snapshot test", {
     )
   })
 })
+
+test_that("BFS does not pad order", {
+  g <- make_star(3)
+  expect_equal(as.numeric(bfs(g, root = 2, unreachable = FALSE)$order), c(2, 1))
+
+  local_igraph_options(return.vs.es = FALSE)
+  expect_equal(as.numeric(bfs(g, root = 2, unreachable = FALSE)$order), c(2, 1))
+})
diff --git a/tests/testthat/test-graph.dfs.R b/tests/testthat/test-graph.dfs.R
@@ -6,4 +6,7 @@ test_that("DFS uses 1-based root vertex index", {
 test_that("DFS does not pad order", {
   g <- make_star(3)
   expect_equal(as.numeric(dfs(g, root = 2, unreachable = FALSE)$order), c(2, 1))
+
+  local_igraph_options(return.vs.es = FALSE)
+  expect_equal(as.numeric(bfs(g, root = 2, unreachable = FALSE)$order), c(2, 1))
 })
diff --git a/tests/testthat/test-graphNEL.R b/tests/testthat/test-graphNEL.R
@@ -1,7 +1,7 @@
 test_that("graphNEL conversion works", {
   if (!requireNamespace("graph", quietly = TRUE)) skip("No graph package")
 
-  library(graph, warn.conflicts = FALSE)
+  suppressPackageStartupMessages(library(graph, warn.conflicts = FALSE))
 
   g <- sample_gnp(100, 5 / 100)
   N <- as_graphnel(g)