From c40ee8668a4002ed601ee1222de92d0b2e530acd Mon Sep 17 00:00:00 2001 From: Marsel Scheer Date: Thu, 10 Apr 2025 20:15:26 +0200 Subject: [PATCH 1/5] update version number for next dev-cycle. fix badge url to codecov --- DESCRIPTION | 2 +- NEWS.md | 5 +++++ README.Rmd | 2 +- README.md | 7 ++++--- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 3562423..2faa57b 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.8.9000 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. diff --git a/NEWS.md b/NEWS.md index 4b19ee0..c282315 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,9 @@ +Version 1.1.8.9000 +========================= + +* placeholder for next development-cycle + Version 1.1.8 ========================= 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..3f2c793 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: 1329200 + #> Start of the simulation: 2025-04-10 18:09:19.481191 + #> End of the simulation: 2025-04-10 18:09:22.189585 ## Installation From 6579d275fc5a5689bf87cc2fbbccf117c46c6cc4 Mon Sep 17 00:00:00 2001 From: Marsel Scheer Date: Wed, 21 Jan 2026 18:35:05 +0100 Subject: [PATCH 2/5] replace .dots with pick(all_of()), solves #11 --- R/define_simulation.R | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 { From 9d2bc0a14b8b4bebb0b4b790cbad876cd860b1ef Mon Sep 17 00:00:00 2001 From: Marsel Scheer Date: Sat, 24 Jan 2026 08:00:50 +0100 Subject: [PATCH 3/5] update news --- NEWS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NEWS.md b/NEWS.md index c282315..586d330 100644 --- a/NEWS.md +++ b/NEWS.md @@ -2,7 +2,7 @@ Version 1.1.8.9000 ========================= -* placeholder for next development-cycle +* address deprecated .dots argument of group_by() due to upcoming dplyr version 1.2.0 Version 1.1.8 ========================= From b30ad43fec07d2e33dceef3f52322a6368a159e1 Mon Sep 17 00:00:00 2001 From: Marsel Scheer Date: Sat, 24 Jan 2026 08:28:01 +0100 Subject: [PATCH 4/5] update version in DESCRIPTION and NEWS.md --- DESCRIPTION | 4 ++-- NEWS.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 2faa57b..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.9000 +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 586d330..7f3aea5 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,5 +1,5 @@ -Version 1.1.8.9000 +Version 1.1.9 ========================= * address deprecated .dots argument of group_by() due to upcoming dplyr version 1.2.0 From 3d99a748dadc53079e7d9705d19b5e49502beedd Mon Sep 17 00:00:00 2001 From: Marsel Scheer Date: Sat, 24 Jan 2026 08:30:54 +0100 Subject: [PATCH 5/5] rebuild README --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 3f2c793..de465ac 100644 --- a/README.md +++ b/README.md @@ -64,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: 1329200 - #> Start of the simulation: 2025-04-10 18:09:19.481191 - #> End of the simulation: 2025-04-10 18:09:22.189585 + #> 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