Refactor PredictTcellActivation and simplify class names

NAMESPACE

@@ -5,7 +5,6 @@ export(CalculateUCellScores)
 export(Classify_ImmuneCells)
 export(Classify_Myeloid)
 export(Classify_TNK)
-export(CombineTcellActivationClasses)
 export(DownloadFromGEO)
 export(ExpandGeneList)
 export(ExtractGeneWeights)
@@ -25,6 +24,7 @@ export(PlotMarkerSeries)
 export(PlotUcellCorrelation)
 export(PredictCellTypeProbability)
 export(PredictTcellActivation)
+export(PredictTcellActivationUsingCustomModel)
 export(RunCellTypist)
 export(RunScGate)
 export(RunScGateForModels)

tests/testthat/test-classification.R

@@ -27,7 +27,7 @@ SimulateSeuratData <- function() {
 
   #grab General component files (9 components)
   for (i in 1:9) {
-    savedFile <- system.file(paste0("components/General_Activation_sPLSDA_component", i, ".tsv"), package = "RIRA")
+    savedFile <- system.file(paste0("components/GeneralizedTCR_Activation_sPLSDA_component", i, ".tsv"), package = "RIRA")
     component <- utils::read.table(savedFile, header = T, sep = '\t')
     features <- c(features, component$feature)
   }
@@ -143,67 +143,51 @@ test_that("Predict TCell Activation works ", {
 
   SimulateSeuratObj <- SimulateSeuratData()
   SimulateSeuratObj <- PredictTcellActivation(SimulateSeuratObj)
+  SimulateSeuratObj <- PredictTcellActivation(SimulateSeuratObj, modelName = 'CD4')
+  SimulateSeuratObj <- PredictTcellActivation(SimulateSeuratObj, modelName = 'CD8')
 
   #exhaustive check on component scores, since all are necessary for the default parameterization of the function
   for (i in 1:6) {
-    pattern <- paste0("^CD8_Activation_sPLSDA_Score_", i, "_v\\d+$")
-    matchingCols <- grep(pattern, colnames([email protected]), value = TRUE)
-    testthat::expect_true(length(matchingCols) > 0,
-                          label = paste0("CD8_Activation_sPLSDA_Score_", i, " (with version) should be present"))
+    colName <- paste0("CD8_sPLSDA_Score_", i)
+    testthat::expect_true(colName %in% names([email protected]))
   }
 
   for (i in 1:6) {
-    pattern <- paste0("^CD4_Activation_sPLSDA_Score_", i, "_v\\d+$")
-    matchingCols <- grep(pattern, colnames([email protected]), value = TRUE)
-    testthat::expect_true(length(matchingCols) > 0,
-                          label = paste0("CD4_Activation_sPLSDA_Score_", i, " (with version) should be present"))
+    colName <- paste0("CD4_sPLSDA_Score_", i)
+    testthat::expect_true(colName %in% names([email protected]), label = paste0('Missing: colName'))
   }
 
   for (i in 1:9) {
-    pattern <- paste0("^General_Activation_sPLSDA_Score_", i, "_v\\d+$")
-    matchingCols <- grep(pattern, colnames([email protected]), value = TRUE)
-    testthat::expect_true(length(matchingCols) > 0,
-                          label = paste0("General_Activation_sPLSDA_Score_", i, " (with version) should be present"))
+    colName <- paste0("GeneralizedTCR_sPLSDA_Score_", i)
+    testthat::expect_true(colName %in% names([email protected]))
   }
 
   #check that the scores are numeric
-  cd8_score_2 <- grep("^CD8_Activation_sPLSDA_Score_2_v\\d+$", colnames([email protected]), value = TRUE)[1]
-  cd4_score_3 <- grep("^CD4_Activation_sPLSDA_Score_3_v\\d+$", colnames([email protected]), value = TRUE)[1]
-  general_score_7 <- grep("^General_Activation_sPLSDA_Score_7_v\\d+$", colnames([email protected]), value = TRUE)[1]
-
-  testthat::expect_type([email protected][5, cd8_score_2], "double")
-  testthat::expect_type([email protected][5, cd4_score_3], "double")
-  testthat::expect_type([email protected][5, general_score_7], "double")
+  testthat::expect_type([email protected][5, 'CD8_sPLSDA_Score_2'], "double")
+  testthat::expect_type([email protected][5, 'CD4_sPLSDA_Score_3'], "double")
+  testthat::expect_type([email protected][5, 'GeneralizedTCR_sPLSDA_Score_7'], "double")
 
   #check that prediction portion of the function worked
+
   #probabilities
-  testthat::expect_true(any(grepl("^CD8_sPLS_prob.*_v\\d+$", colnames([email protected]))),
-                        label = "CD8 probability columns (with version) should be present")
-  testthat::expect_true(any(grepl("^CD4_sPLS_prob.*_v\\d+$", colnames([email protected]))),
-                        label = "CD4 probability columns (with version) should be present")
-  testthat::expect_true(any(grepl("^General_sPLS_prob.*_v\\d+$", colnames([email protected]))),
-                        label = "General probability columns (with version) should be present")
+  testthat::expect_equal(4, sum(grepl("^CD8_sPLSDA_prob_", colnames([email protected]))))
+  testthat::expect_equal(5, sum(grepl("^CD4_sPLSDA_prob_", colnames([email protected]))))
+  testthat::expect_equal(14, sum(grepl("^GeneralizedTCR_sPLSDA_prob_", colnames([email protected]))))
+
   #classes
-  testthat::expect_true(any(grepl("^CD8_sPLS_class_v\\d+$", colnames([email protected]))),
-                        label = "CD8 class column (with version) should be present")
-  testthat::expect_true(any(grepl("^CD4_sPLS_class_v\\d+$", colnames([email protected]))),
-                        label = "CD4 class column (with version) should be present")
-  testthat::expect_true(any(grepl("^General_sPLS_class_v\\d+$", colnames([email protected]))),
-                        label = "General class column (with version) should be present")
-
+  testthat::expect_equal(1, sum(grepl("CD8_sPLSDA_class", colnames([email protected]))))
+  testthat::expect_equal(1, sum(grepl("CD4_sPLSDA_class", colnames([email protected]))))
+  testthat::expect_equal(1, sum(grepl("GeneralizedTCR_sPLSDA_class", colnames([email protected]))))
+
   #verify specific probability value
-  cd4_prob_resting1 <- grep("^CD4_sPLS_prob_Resting1_v\\d+$", colnames([email protected]), value = TRUE)[1]
-  testthat::expect_equal([email protected][5, cd4_prob_resting1], 
-                         expected = 0.0086, 
-                         tolerance = 0.001)
+  testthat::expect_equal([email protected][5, 'CD4_sPLSDA_prob_Resting1'], expected = 0.0086, tolerance = 0.001)
 })
 
 
 test_that("CombineTcellActivationClasses combines classes and writes versioned columns", {
   seuratObj <- SimulateSeuratData()
-  seuratObj <- PredictTcellActivation(seuratObj)
+  seuratObj <- PredictTcellActivation(seuratObj, combineClasses = FALSE)
 
-  #use the example mapping from roxygen docs
   classMapping <- list(
     "Th1" = c("Th1_MIP1B.neg_CD137.neg", "Th1_MIP1B.neg_CD137.pos", "Th1_MIP1B.pos"),
     "Th17" = c("Th17"), 
@@ -212,15 +196,15 @@ test_that("CombineTcellActivationClasses combines classes and writes versioned c
     "Naive T cell" = c("Cultured_Bystander_NoBFA", "Cultured_Bystander_BFA")
   )
 
-  seuratObj <- CombineTcellActivationClasses(seuratObj, classMapping = classMapping)
+  seuratObj <- .CombineTcellActivationClasses(seuratObj, classMapping = classMapping, sourceFieldPrefix = 'GeneralizedTCR_sPLSDA', outputFieldPrefix = 'CustomizedClasses')
 
   #confirm combined class column exists with model/version naming
-  combinedClassCol <- grep("^General_Combined_Class_v\\d+$", colnames([email protected]), value = TRUE)
+  combinedClassCol <- grep("^CustomizedClasses_ConsensusClass$", colnames([email protected]), value = TRUE)
   testthat::expect_true(length(combinedClassCol) == 1)
 
   #confirm combined probability columns exist for each mapping
   for (newClassName in names(classMapping)) {
-    probCol <- grep(paste0("^General_Combined_prob_", newClassName, "_v\\d+$"), colnames([email protected]), value = TRUE)
+    probCol <- grep(paste0("^CustomizedClasses_prob_", newClassName, "$"), colnames([email protected]), value = TRUE)
     testthat::expect_true(length(probCol) == 1, label = paste0("Missing combined prob column for: ", newClassName))
   }
 
@@ -231,19 +215,19 @@ test_that("CombineTcellActivationClasses combines classes and writes versioned c
 
   #empty names not allowed
   badMapping1 <- list(NULL = c("Th17"))
-  expect_error(CombineTcellActivationClasses(seuratObj, classMapping = badMapping1))
+  expect_error(.CombineTcellActivationClasses(seuratObj, classMapping = badMapping1, sourceFieldPrefix = 'GeneralizedTCR_sPLSDA', outputFieldPrefix = 'CustomizedClasses'))
   #non-character values not allowed
   badMapping2 <- list("Th17" = 1)
-  expect_error(CombineTcellActivationClasses(seuratObj, classMapping = badMapping2))
+  expect_error(.CombineTcellActivationClasses(seuratObj, classMapping = badMapping2, sourceFieldPrefix = 'GeneralizedTCR_sPLSDA', outputFieldPrefix = 'CustomizedClasses'))
   #empty vector not allowed
   badMapping3 <- list("Th17" = character(0))
-  expect_error(CombineTcellActivationClasses(seuratObj, classMapping = badMapping3))
+  expect_error(.CombineTcellActivationClasses(seuratObj, classMapping = badMapping3, sourceFieldPrefix = 'GeneralizedTCR_sPLSDA', outputFieldPrefix = 'CustomizedClasses'))
   #duplicate classes across mappings not allowed
   badMapping4 <- list("A" = c("Th17"), "B" = c("Th17"))
-  expect_error(CombineTcellActivationClasses(seuratObj, classMapping = badMapping4))
+  expect_error(.CombineTcellActivationClasses(seuratObj, classMapping = badMapping4, sourceFieldPrefix = 'GeneralizedTCR_sPLSDA', outputFieldPrefix = 'CustomizedClasses'))
   #classes not present in predictions should error
   badMapping5 <- list("X" = c("NotAClass"))
-  expect_warning(CombineTcellActivationClasses(seuratObj, classMapping = badMapping5))
+  expect_warning(.CombineTcellActivationClasses(seuratObj, classMapping = badMapping5, sourceFieldPrefix = 'GeneralizedTCR_sPLSDA', outputFieldPrefix = 'CustomizedClasses'))
 })
 
 
@@ -264,7 +248,6 @@ test_that("Activation class mapping registry works and validates structure", {
   }
 
   # Unknown key should warn and return NULL
-  expect_warning(x <- GetActivationClassMapping('This.Key.Does.Not.Exist'))
-  expect_null(x)
+  expect_error(x <- GetActivationClassMapping('This.Key.Does.Not.Exist'))
 })