Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 24 additions & 17 deletions R/games.R
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

#' The Watts-Strogatz small-world model
#'
#' @description
Expand Down Expand Up @@ -480,7 +479,7 @@ sample_pa <- function(n, power = 1, m = NULL, out.dist = NULL, out.seq = NULL,
),
start.graph = NULL) {
if (!is.null(start.graph) && !is_igraph(start.graph)) {
stop("`start.graph' not an `igraph' object")
cli::cli_abort("{.arg start.graph} must be an {.cls igraph} object, not {.obj_type_friendly {start.graph}}.")
}

# Checks
Expand Down Expand Up @@ -727,7 +726,7 @@ erdos.renyi.game <- function(n, p.or.m, type = c("gnp", "gnm"),
#' @family games
#' @export
random.graph.game <- function(n, p.or.m, type = c("gnp", "gnm"),
directed = FALSE, loops = FALSE) {
directed = FALSE, loops = FALSE) {
type <- igraph.match.arg(type)

if (type == "gnp") {
Expand Down Expand Up @@ -1124,16 +1123,16 @@ sample_pa_age <- function(n, pa.exp, aging.exp, m = NULL, aging.bin = 300,
m <- NULL
}
if (!is.null(out.seq) && length(out.seq) != n) {
stop("`out.seq' should be of length `n'")
cli::cli_abort("{.arg out.seq} must have length {.val n}, not {.val {length( out.seq)}}.'")
}
if (!is.null(out.seq) && min(out.seq) < 0) {
stop("negative elements in `out.seq'")
cli::cli_abort("{.arg out.seq} must not contain negative elements.")
}
if (!is.null(m) && m < 0) {
stop("`m' is negative")
cli::cli_abort("{.arg m} must be positive or 0.")
}
if (!is.null(time.window) && time.window <= 0) {
stop("time window size should be positive")
cli::cli_abort("{.arg time.window} must be positive.")
}
if (!is.null(m) && m == 0) {
cli::cli_warn("{.arg m} is zero, graph will be empty.")
Expand Down Expand Up @@ -1425,7 +1424,10 @@ sample_pref <- function(nodes, types, type.dist = rep(1, types),
pref.matrix = matrix(1, types, types),
directed = FALSE, loops = FALSE) {
if (nrow(pref.matrix) != types || ncol(pref.matrix) != types) {
stop("Invalid size for preference matrix")
cli::cli_abort(c(
"{.arg pref.matrix} must have {.arg types} rows and columns.",
i = "See {.fun igraph::sample_pref}'s manual."
))
}

on.exit(.Call(R_igraph_finalizer))
Expand Down Expand Up @@ -1460,10 +1462,16 @@ sample_asym_pref <- function(nodes, types,
pref.matrix = matrix(1, types, types),
loops = FALSE) {
if (nrow(pref.matrix) != types || ncol(pref.matrix) != types) {
stop("Invalid size for preference matrix")
cli::cli_abort(c(
"{.arg pref.matrix} must have {.arg types} rows and columns.",
i = "See {.fun igraph::sample_asym_pref}'s manual."
))
}
if (nrow(type.dist.matrix) != types || ncol(type.dist.matrix) != types) {
stop("Invalid size for type distribution matrix")
cli::cli_abort(c(
"{.arg type.dist.matrix} must have {.arg types} rows and columns.",
i = "See {.fun igraph::sample_asym_pref}'s manual."
))
}

on.exit(.Call(R_igraph_finalizer))
Expand Down Expand Up @@ -1758,16 +1766,16 @@ sample_bipartite <- function(n1, n2, type = c("gnp", "gnm"), p, m,
)

if (type == "gnp" && missing(p)) {
stop("Connection probability `p' is not given for Gnp graph")
cli::cli_abort("Connection probability {.arg p} must be given for Gnp graph")
}
if (type == "gnp" && !missing(m)) {
cli::cli_warn("Number of edges {.arg m} is ignored for Gnp graph.")
}
if (type == "gnm" && missing(m)) {
stop("Number of edges `m' is not given for Gnm graph")
cli::cli_abort("Number of edges {.arg m} must be given for Gnm graph")
}
if (type == "gnm" && !missing(p)) {
cli::cli_warn("Connection probability {.arg p} is ignored for Gnp graph.")
cli::cli_warn("Connection probability {.arg p} is ignored for Gnm graph.")
}

on.exit(.Call(R_igraph_finalizer))
Expand Down Expand Up @@ -1888,7 +1896,7 @@ sample_hierarchical_sbm <- function(n, m, rho, C, p) {
} else {
commonlen <- setdiff(commonlen, 1)
if (length(commonlen) != 1) {
stop("Lengths of `m', `rho' and `C' must match")
cli::cli_abort("Lengths of {.arg m}, {.arg rho} and {.arg C} must match.")
}
m <- rep(m, length.out = commonlen)
rho <- if (is.list(rho)) {
Expand Down Expand Up @@ -2165,7 +2173,7 @@ sample_k_regular <- k_regular_game_impl
#'
#' rowMeans(replicate(
#' 100,
#' degree(sample_chung_lu(c(1, 3, 2, 1), c(2, 1, 2, 2), variant = "maxent"), mode='out')
#' degree(sample_chung_lu(c(1, 3, 2, 1), c(2, 1, 2, 2), variant = "maxent"), mode = "out")
#' ))
#' @export
#' @cdocs igraph_chung_lu_game
Expand All @@ -2178,8 +2186,7 @@ chung_lu <- function(
in.weights = NULL,
...,
loops = TRUE,
variant = c("original", "maxent", "nr")
) {
variant = c("original", "maxent", "nr")) {
variant <- rlang::arg_match(variant)
constructor_spec(
sample_chung_lu,
Expand Down
76 changes: 0 additions & 76 deletions tests/testthat/test-ba.game.R

This file was deleted.

53 changes: 0 additions & 53 deletions tests/testthat/test-bipartite.random.game.R

This file was deleted.

13 changes: 0 additions & 13 deletions tests/testthat/test-chung_lu.R

This file was deleted.

88 changes: 0 additions & 88 deletions tests/testthat/test-correlated.R

This file was deleted.

34 changes: 0 additions & 34 deletions tests/testthat/test-forestfire.R

This file was deleted.

Loading