Corrected manynet dependencies and net_ naming in tests

stocnet · Jun 23, 2024 · 8137de6 · 8137de6
1 parent 1daea5a
commit 8137de6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/R/model_tests.R b/R/model_tests.R
@@ -40,8 +40,8 @@ test_random <- function(.data, FUN, ...,
   } else {
     obsd <- FUN(.data)
   }
-  n <- manynet::network_dims(.data)
-  d <- network_density(.data)
+  n <- manynet::net_dims(.data)
+  d <- manynet::net_density(.data)
   oplan <- future::plan(strategy)
   on.exit(future::plan(oplan), add = TRUE)
   rands <- furrr::future_map(1:times, manynet::generate_random, n = n, p = d, 
@@ -90,8 +90,8 @@ test_permutation <- function(.data, FUN, ...,
   } else {
     obsd <- FUN(.data)
   }
-  n <- manynet::network_dims(.data)
-  d <- network_density(.data)
+  n <- manynet::net_dims(.data)
+  d <- manynet::net_density(.data)
   oplan <- future::plan(strategy)
   on.exit(future::plan(oplan), add = TRUE)
   rands <- furrr::future_map(1:times, 

diff --git a/tests/testthat/test-model_tests.R b/tests/testthat/test-model_tests.R
@@ -2,14 +2,14 @@
 marvel_friends <- manynet::to_giant(manynet::to_unsigned(manynet::ison_marvel_relationships)) %>%
   manynet::to_subgraph(PowerOrigin == "Human")
 cugtest <- test_random(marvel_friends,
-                       network_heterophily,
+                       manynet::net_heterophily,
                        attribute = "Attractive",
                        times = 200)
 cugtest2 <- test_random(marvel_friends,
-                        network_betweenness,
+                        manynet::net_betweenness,
                         times = 200)
 cugtest3 <- test_random(ison_southern_women, 
-                        network_equivalency, 
+                        manynet::net_equivalency, 
                         times = 200)
 
 test_that("test_random works", {
@@ -42,7 +42,7 @@ marvel_friends <- manynet::to_unsigned(manynet::ison_marvel_relationships)
 marvel_friends <- manynet::to_giant(marvel_friends)
 marvel_friends <- manynet::to_subgraph(marvel_friends, PowerOrigin == "Human")
 qaptest <- test_permutation(marvel_friends,
-                            network_heterophily,
+                            manynet::net_heterophily,
                             attribute = "Attractive",
                             times = 200)
 test_that("test_permutation works", {