fix imports

Author: rcannood

DESCRIPTION

@@ -18,12 +18,14 @@ Imports:
   dynwrap (>= 1.0.0),
   igraph,
   magrittr,
+  methods,
   mvtnorm,
   purrr,
   stats,
   testthat,
   tibble,
-  tidyr
+  tidyr,
+  utils
 Suggests:
   dynnormaliser (>= 0.9.9)
 Remotes: 

NAMESPACE

@@ -29,5 +29,10 @@ importFrom(dynwrap,add_prior_information)
 importFrom(magrittr,"%$%")
 importFrom(magrittr,"%<>%")
 importFrom(magrittr,set_colnames)
+importFrom(methods,formalArgs)
+importFrom(stats,dexp)
+importFrom(stats,rbinom)
+importFrom(stats,rnbinom)
 importFrom(stats,runif)
-importFrom(testthat,expect_gte)
+importFrom(utils,head)
+importFrom(utils,tail)

R/1-topology_models.R

@@ -8,7 +8,10 @@ general_graph_model_fun <- function(
   if (is.function(num_modifications)) num_modifications <- num_modifications()
   if (is.function(max_degree)) max_degree <- max_degree()
 
-  testthat::expect_gte(num_modifications, 1)
+  assert_that(
+    num_modifications >= 1,
+    max_degree >= 3
+  )
   testthat::expect_gte(max_degree, 3)
 
   milnet <- tribble(
@@ -88,13 +91,14 @@ general_graph_model_fun <- function(
 
 #' @param num_milestones The number of milestones in the trajectory (linear, cyclic)
 #' @rdname topology_models
+#' @importFrom utils head tail
 #' @export
 model_linear <- function(
   num_milestones = function() rbinom(1, size = 10, .25) + 2
 ) {
   if (is.function(num_milestones)) num_milestones <- num_milestones()
 
-  testthat::expect_gte(num_milestones, 2)
+  assert_that(num_milestones >= 2)
 
   milestone_ids <- paste0("M", seq_len(num_milestones))
   tibble(
@@ -110,7 +114,7 @@ model_cyclic <- function(
 ) {
   if (is.function(num_milestones)) num_milestones <- num_milestones()
 
-  testthat::expect_gte(num_milestones, 3)
+  assert_that(num_milestones >= 3)
 
   topology_models$linear(num_milestones) %>%
     add_row(from = paste0("M", num_milestones), to = "M1")

R/2-generate_milestone_network.R

@@ -9,6 +9,7 @@
 #' @param ... Parameters to pass to other models. Can be in the form of `linear = list(num_milestones = function() sample(2:8, 1)` or just `num_milestones = 10`.
 #'
 #' @export
+#' @importFrom methods formalArgs
 generate_milestone_network <- function(
   model = names(topology_models),
   ...

R/package.R

@@ -8,8 +8,7 @@
 #' @import purrr
 #' @importFrom assertthat assert_that
 #' @importFrom magrittr %<>% %$% set_colnames
-#' @importFrom stats runif
-#' @importFrom testthat expect_gte
+#' @importFrom stats runif rbinom rnbinom dexp
 #'
 #' @docType package
 #' @name dyntoy