Merge pull request #181 from MangiolaLaboratory/check-for-factor-consistency

fix check for ~ 1 formula

Author: stemangiola

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: sccomp
 Title: Tests differences in cell-type proportion for single-cell data, robust to outliers
-Version: 1.99.12
+Version: 1.99.13
 Authors@R: c(person("Stefano", "Mangiola", email = "[email protected]",
                   role = c("aut", "cre"))
                   )

R/utilities.R

@@ -3548,6 +3548,10 @@ check_sample_consistency_of_factors = function(.data, my_formula, .sample, .cell
   # Check that I have one set of covariates per sample
   first_cell_group = .data |> pull(!!.cell_group) |> _[[1]]
 
+  # If the formula is intercept only -> ~ 1 this test does not apply
+  if(my_formula |> parse_formula() |> length() == 0)
+    return(TRUE)
+  
   any_covariate_not_matching_sample_size = 
     .data |> 
     filter(!!.cell_group == first_cell_group) |> 

tests/testthat/test-sccomp_.R

@@ -810,6 +810,16 @@ test_that("sample ID malformed", {
       .abundance = count
     ) |> 
     expect_no_error()
+  
+  # For ~ 1 formula do not expect error
+  model_without_association = 
+    seurat_obj |>
+    sccomp_estimate( 
+      formula_composition = ~ 1, 
+      .sample =  sample, 
+      .cell_group = cell_group
+    ) |> 
+    expect_no_error()
 
 })