From c84b01a1f786ac534bb9224db78fa3d550ffba31 Mon Sep 17 00:00:00 2001 From: Bartek Czech Date: Tue, 28 Apr 2026 14:16:12 +0200 Subject: [PATCH 1/2] GDR-3366: replace hardcoded Duration values with NA_real_ --- DESCRIPTION | 4 ++-- NEWS.md | 3 +++ R/prism_to_gdrDF.R | 4 ++-- R/pset_to_gdrDF.R | 3 +-- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 896c3ee1..4f365da4 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Package: gDRimport Type: Package Title: Package for handling the import of dose-response data -Version: 1.9.11 -Date: 2026-04-23 +Version: 1.9.12 +Date: 2026-04-28 Authors@R: c( person("Arkadiusz", "Gladki", role=c("aut", "cre"), email="gladki.arkadiusz@gmail.com", comment = c(ORCID = "0000-0002-7059-6378")), diff --git a/NEWS.md b/NEWS.md index 8656090d..5ea562ac 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,6 @@ +## gDRimport 1.9.12 - 2026-04-28 +* replace hardcoded `Duration` values with `NA_real_` in PRISM and PSet importers + ## gDRimport 1.9.11 - 2026-04-23 * add support for generation of day0 template for tdd files diff --git a/R/prism_to_gdrDF.R b/R/prism_to_gdrDF.R index 6023c08b..6fd9dc1e 100644 --- a/R/prism_to_gdrDF.R +++ b/R/prism_to_gdrDF.R @@ -278,7 +278,7 @@ convert_LEVEL6_prism_to_gDR_input <- function(prism_data_path, Gnumber = untrt_tag, DrugName = untrt_tag, drug_moa = untrt_tag, - Duration = 120, + Duration = NA_real_, Concentration = 0, ReadoutValue = 1, masked = FALSE) @@ -299,7 +299,7 @@ convert_LEVEL6_prism_to_gDR_input <- function(prism_data_path, data.table::setnames(dt_trt, old = c("broad_id", "name", "moa", "dose", "value"), new = c("Gnumber", "DrugName", "drug_moa", "Concentration", "ReadoutValue")) - dt_trt$Duration <- 120 + dt_trt$Duration <- NA_real_ dt_trt$masked <- FALSE data.table::setcolorder(dt_trt, neworder = colnames(dt_ctrl)) diff --git a/R/pset_to_gdrDF.R b/R/pset_to_gdrDF.R index a3794fe1..269b9d19 100644 --- a/R/pset_to_gdrDF.R +++ b/R/pset_to_gdrDF.R @@ -202,9 +202,8 @@ getPSet <- function(pset_name, refDivTime <- gDRutils::get_env_identifiers("cellline_ref_div_time") - # Some datasets do not have duration specified so let's assign any value, since it is required by gDR if (!duration %in% names(dt)) { - dt[, (duration) := 72] + dt[, (duration) := NA_real_] } if (!refDivTime %in% names(dt)) { dt[, (refDivTime) := NA] From 6b8200703b14ec884901b71b9e1adbbfcf9cffe4 Mon Sep 17 00:00:00 2001 From: Bartek Czech Date: Tue, 28 Apr 2026 14:18:25 +0200 Subject: [PATCH 2/2] GDR-3366: update tests to expect NA_real_ Duration in level6 PRISM --- tests/testthat/test-prism_to_gdrDF.R | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/testthat/test-prism_to_gdrDF.R b/tests/testthat/test-prism_to_gdrDF.R index 8645df5c..9c3d097a 100644 --- a/tests/testthat/test-prism_to_gdrDF.R +++ b/tests/testthat/test-prism_to_gdrDF.R @@ -61,7 +61,9 @@ test_that("prism level6 data can be processed into gDR format ", { "subtype", "ReferenceDivisionTime")) expect_true(all(gDRutils::get_env_identifiers(c("drug", "cellline"), simplify = FALSE) %in% names(df_prism$result))) - + expect_true(all(is.na(df_prism$result$Duration))) + expect_type(df_prism$result$Duration, "double") + # testing format of clid, CellLineName and Tissue column expect_equal(df_prism$result$clid, df_prism$result$CellLineName) expect_equal(