Skip to content

Gdr 771 #72

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bczech merged 2 commits into from
Aug 21, 2025
Merged

Gdr 771 #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
57a95d9
fix: usage of ifelse
bczech Aug 12, 2025
50bab11
chore: bump version and update NEWS.md
bczech Aug 12, 2025
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
4 changes: 2 additions & 2 deletions DESCRIPTION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
3 changes: 3 additions & 0 deletions NEWS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
8 changes: 4 additions & 4 deletions R/generate_data.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Loading