Merge pull request #165 from gdrplatform/hotfix_annotation

hotfix: annotation
gdrplatform · Oct 30, 2024 · 0215f0f · 0215f0f
2 parents 0938189 + 691eb06
commit 0215f0f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -2,8 +2,8 @@ Type: Package
 Package: gDRcore
 Title: Processing functions and interface to process and analyze drug
     dose-response data
-Version: 1.3.14
-Date: 2024-10-24
+Version: 1.3.15
+Date: 2024-10-30
 Authors@R: c(
     person("Bartosz", "Czech", , "[email protected]", role = "aut",
            comment = c(ORCID = "0000-0002-9908-3007")),

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,6 @@
+## gDRcore 1.3.15 - 2024-10-30
+* hot fix for annotation colnames of cell lines
+
 ## gDRcore 1.3.14 - 2024-10-24
 * split and refactor annotation functions
 

diff --git a/R/add_annotation.R b/R/add_annotation.R
@@ -96,13 +96,13 @@ annotate_dt_with_cell_line <- function(
   cellline <- gDRutils::get_env_identifiers("cellline")
   add_clid <- gDRutils::get_header("add_clid")
 
+  checkmate::assert_names(names(cell_line_annotation), must.include = c(cellline, unlist(add_clid)))
+
   # Remove existing annotations if any
   existing_cols <- intersect(unlist(add_clid), names(data))
   if (length(existing_cols) > 0) {
     data[, (existing_cols) := NULL]
   }
-
-  colnames(cell_line_annotation) <- c(cellline, unlist(add_clid))
   data <- cell_line_annotation[data, on = cellline]
   (data)
 }

diff --git a/tests/testthat/test-add_annotation.R b/tests/testthat/test-add_annotation.R
@@ -20,6 +20,7 @@ test_that("annotate_dt_with_cell_line works correctly", {
     subtype = c("Subtype 1", "Subtype 2")
   )
   result <- annotate_dt_with_cell_line(data, cell_line_annotation, fill = "unknown")
+  expect_true(all(c(24, 48) %in% result$ReferenceDivisionTime))
   expect_true("data.table" %in% class(result))
   expect_equal(ncol(result), ncol(data) + ncol(cell_line_annotation) - 1)
   expect_equal(result$CellLineName, c("Cell Line 1", "Cell Line 2", NA))