diff --git a/R/mixture.R b/R/mixture.R index 4fc7d6d..fb49571 100644 --- a/R/mixture.R +++ b/R/mixture.R @@ -28,11 +28,9 @@ dist_mixture <- function(..., weights = numeric()){ #' @export format.dist_mixture <- function(x, width = getOption("width"), ...){ - dists <- lapply(x[["dist"]], format) |> - unlist() + dists <- unlist(lapply(x[["dist"]], format)) - dist_info <- paste0(x[["w"]], "*", dists) |> - paste0(collapse = ", ") + dist_info <- paste0(x[["w"]], "*", dists, collapse = ", ") long_dist <- paste0("mixture(", dist_info, ")") short_dist <- paste0("mixture(n=", length(dists), ")") diff --git a/tests/testthat/test_gev.R b/tests/testthat/test_gev.R index 874fad8..f4c55ad 100644 --- a/tests/testthat/test_gev.R +++ b/tests/testthat/test_gev.R @@ -43,15 +43,15 @@ test_that("GEV", { # Generate set.seed(123) rand_dist <- distributional::generate(dist, times = 1e6) - expect_equal(lapply(rand_dist[1:2], mean) |> unlist(), + expect_equal(unlist(lapply(rand_dist[1:2], mean)), mean(dist)[1:2], tolerance = 0.01 ) - expect_equal(lapply(rand_dist[1:2], var) |> unlist(), + expect_equal(unlist(lapply(rand_dist[1:2], var)), distributional::variance(dist)[1:2], tolerance = 0.01 ) - expect_equal(lapply(rand_dist, median) |> unlist(), + expect_equal(unlist(lapply(rand_dist, median)), median(dist), tolerance = 0.01 ) diff --git a/tests/testthat/test_gpd.R b/tests/testthat/test_gpd.R index b40172f..1699436 100644 --- a/tests/testthat/test_gpd.R +++ b/tests/testthat/test_gpd.R @@ -42,15 +42,15 @@ test_that("GPD", { # Generate set.seed(123) rand_dist <- distributional::generate(dist, times = 1e6) - expect_equal(lapply(rand_dist[1:2], mean) |> unlist(), + expect_equal(unlist(lapply(rand_dist[1:2], mean)), mean(dist)[1:2], tolerance = 0.01 ) - expect_equal(lapply(rand_dist[1:2], var) |> unlist(), + expect_equal(unlist(lapply(rand_dist[1:2], var)), distributional::variance(dist)[1:2], tolerance = 0.01 ) - expect_equal(lapply(rand_dist, median) |> unlist(), + expect_equal(unlist(lapply(rand_dist, median)), median(dist), tolerance = 0.01 )