diff --git a/DESCRIPTION b/DESCRIPTION index 0cd597b..dffdc7f 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: gDRtestData Title: gDRtestData - R data package with testing dose response data -Version: 1.7.2 -Date: 2025-07-29 +Version: 1.7.3 +Date: 2025-08-12 Description: R package with internal dose-response test data. Package provides functions to generate input testing data that can be used as the input for gDR pipeline. It also contains qs files with MAE data processed by gDR. diff --git a/NEWS.md b/NEWS.md index b06fe9c..fc7dbda 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,6 @@ +## gDRtestData 1.7.3 - 2025-08-12 +* fix usage of `ifelse` + ## gDRtestData 1.7.2 - 2025-07-29 * update test data diff --git a/R/generate_data.R b/R/generate_data.R index 12780f2..c24f3dd 100644 --- a/R/generate_data.R +++ b/R/generate_data.R @@ -146,11 +146,11 @@ introduceGNum <- function(df, e_inf, ec50, hill_coef, suffix) { #' @export #' add_day0_data <- function(df_merged, noise_level = 0.05) { - cond <- ifelse( - array("Concentration_2", nrow(df_merged)) %in% colnames(df_merged), - df_merged$Concentration_2 == 0, + cond <- if ("Concentration_2" %in% colnames(df_merged)) { + df_merged$Concentration_2 == 0 + } else { TRUE - ) + } df_Day0 <- unique(df_merged[df_merged$Concentration == 0 & cond, ]) df_Day0$ReadoutValue <- df_Day0$ReadoutValue / 2 ^ (df_Day0$Duration / df_Day0$ReferenceDivisionTime)