diff --git a/DESCRIPTION b/DESCRIPTION index 3562423..17a145b 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: simTool Type: Package Title: Conduct Simulation Studies with a Minimal Amount of Source Code -Version: 1.1.8 +Version: 1.1.9 Authors@R: person("Marsel", "Scheer", role = c("aut", "cre"), email = "scheer@freescience.de") Maintainer: Marsel Scheer Description: Tool for statistical simulations that have two components. @@ -34,6 +34,6 @@ Suggests: covr License: GPL-3 VignetteBuilder: knitr -RoxygenNote: 7.3.2 +RoxygenNote: 7.3.3 URL: https://marselscheer.github.io/simTool/ BugReports: https://github.com/MarselScheer/simTool/issues diff --git a/NEWS.md b/NEWS.md index 4b19ee0..7f3aea5 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,9 @@ +Version 1.1.9 +========================= + +* address deprecated .dots argument of group_by() due to upcoming dplyr version 1.2.0 + Version 1.1.8 ========================= diff --git a/R/define_simulation.R b/R/define_simulation.R index 70bac63..3ed53e7 100644 --- a/R/define_simulation.R +++ b/R/define_simulation.R @@ -40,10 +40,9 @@ define_simulation <- function(pf, discard_generated_data, cluster, ) res <- purrr::map(res, ~ do.call("bind_or_combine", .)) if (!is.null(summary_fun) && !is.null(group_for_summary)) { - class(group_for_summary) <- "list" res <- lapply(summary_fun, function(f) { purrr::map(res, ~ dplyr::summarize_all( - dplyr::group_by(., .dots = group_for_summary), f + dplyr::group_by(., dplyr::pick(dplyr::all_of(group_for_summary))), f )) }) } else { diff --git a/README.Rmd b/README.Rmd index b019cdf..5a4431d 100644 --- a/README.Rmd +++ b/README.Rmd @@ -14,7 +14,7 @@ knitr::opts_chunk$set( [![R build status](https://github.com/MarselScheer/simTool/workflows/R-CMD-check/badge.svg)](https://github.com/MarselScheer/simTool/actions) -[![Coverage Status](https://img.shields.io/codecov/c/github/MarselScheer/simTool/develop.svg)](https://codecov.io/github/MarselScheer/simTool?branch=develop) +[![codecov](https://codecov.io/gh/MarselScheer/simTool/branch/development/graph/badge.svg?token=aCoLwwqLrB)](https://codecov.io/gh/MarselScheer/simTool) [![lifecycle](https://img.shields.io/badge/lifecycle-stable-brightgreen.svg)](https://lifecycle.r-lib.org/articles/stages.html) [![Project Status: Active – The project has reached a stable, usable state and is being actively diff --git a/README.md b/README.md index d1ee4b9..de465ac 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,7 @@ [![R build status](https://github.com/MarselScheer/simTool/workflows/R-CMD-check/badge.svg)](https://github.com/MarselScheer/simTool/actions) +[![codecov](https://codecov.io/gh/MarselScheer/simTool/branch/development/graph/badge.svg?token=aCoLwwqLrB)](https://codecov.io/gh/MarselScheer/simTool) [![lifecycle](https://img.shields.io/badge/lifecycle-stable-brightgreen.svg)](https://lifecycle.r-lib.org/articles/stages.html) [![Project Status: Active – The project has reached a stable, usable state and is being actively @@ -63,9 +64,9 @@ using confidence levels 0.8, 0.9, 0.95 are applied. This is repeated #> Number of data generating functions: 4 #> Number of analyzing procedures: 3 #> Number of replications: 1000 - #> Estimated replications per hour: 1318457 - #> Start of the simulation: 2025-04-05 05:37:59.800157 - #> End of the simulation: 2025-04-05 05:38:02.530619 + #> Estimated replications per hour: 1328974 + #> Start of the simulation: 2026-01-24 07:30:30.279282 + #> End of the simulation: 2026-01-24 07:30:32.988137 ## Installation