Skip to content

Commit

Permalink
Fixed various dependency issues
Browse files Browse the repository at this point in the history
  • Loading branch information
jhollway committed Jul 8, 2024
1 parent 15c8a7c commit cfd8f34
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 24 deletions.
5 changes: 1 addition & 4 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: migraph
Title: Many Network Measures, Motifs, Members, and Models
Version: 1.4.0
Date: 2024-05-23
Date: 2024-07-08
Description: A set of tools for analysing multimodal networks.
It includes functions for measuring
centrality, centralization, cohesion, closure, constraint and diversity,
Expand Down Expand Up @@ -30,10 +30,7 @@ Imports:
network,
future,
furrr,
pillar,
purrr,
rlang,
sna,
tidygraph,
tidyr
Suggests:
Expand Down
5 changes: 4 additions & 1 deletion NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ export(is_igraph)
export(labs)
export(mutate)
export(network_reg)
export(node_adopter)
export(rename)
export(scale_y_discrete)
export(test_distribution)
Expand Down Expand Up @@ -56,6 +55,10 @@ importFrom(ggplot2,scale_y_discrete)
importFrom(ggplot2,xlab)
importFrom(ggplot2,ylab)
importFrom(igraph,is_igraph)
importFrom(manynet,bind_node_attributes)
importFrom(manynet,generate_random)
importFrom(manynet,is_complex)
importFrom(manynet,is_directed)
importFrom(network,as.network)
importFrom(network,is.network)
importFrom(purrr,flatten)
Expand Down
8 changes: 0 additions & 8 deletions R/migraph-defunct.R
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,3 @@ test_gof <- function(diff_model, diff_models) {
old = "test_gof")
test_fit(diff_model, diff_models)
}

#' @describeIn defunct Deprecated on 2024-06-19.
#' @export
node_adopter <- function(diff_model) {
.Deprecated("node_in_adopter", package = "migraph",
old = "node_adopter")
node_in_adopter(diff_model)
}
5 changes: 3 additions & 2 deletions R/model_tests.R
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,12 @@
NULL

#' @rdname tests
#' @importFrom manynet generate_random bind_node_attributes is_directed is_complex
#' @examples
#' marvel_friends <- to_unsigned(ison_marvel_relationships)
#' marvel_friends <- to_giant(marvel_friends) %>%
#' to_subgraph(PowerOrigin == "Human")
#' (cugtest <- test_random(marvel_friends, network_heterophily, attribute = "Attractive",
#' (cugtest <- test_random(marvel_friends, manynet::net_heterophily, attribute = "Attractive",
#' times = 200))
#' plot(cugtest)
#' @export
Expand Down Expand Up @@ -73,7 +74,7 @@ test_random <- function(.data, FUN, ...,
#' @rdname tests
#' @examples
#' (qaptest <- test_permutation(marvel_friends,
#' network_heterophily, attribute = "Attractive",
#' manynet::net_heterophily, attribute = "Attractive",
#' times = 200))
#' plot(qaptest)
#' @export
Expand Down
5 changes: 0 additions & 5 deletions man/defunct.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions man/tests.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions tests/testthat/test-model_tests.R
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ test_that("test_random works", {
expect_equal(length(cugtest$testdist), 200) # NB: Stochastic
expect_false(cugtest$mode)
expect_false(cugtest$diag)
expect_equal(cugtest$cmode, "csize")
expect_equal(cugtest$cmode, "edges")
expect_equal(class(cugtest$plteobs), "numeric")
expect_equal(class(cugtest$pgteobs), "numeric")
expect_equal(cugtest$reps, 200)
Expand All @@ -30,7 +30,7 @@ test_that("test_random works", {
expect_equal(length(cugtest2$testdist), 200) # NB: Stochastic
expect_false(cugtest2$mode)
expect_false(cugtest2$diag)
expect_equal(cugtest2$cmode, "csize")
expect_equal(cugtest2$cmode, "edges")
expect_equal(round(cugtest2$plteobs), 1)
expect_equal(round(cugtest2$pgteobs), 0)
expect_equal(cugtest2$reps, 200)
Expand Down

0 comments on commit cfd8f34

Please sign in to comment.