1.1.24

DiseaseNeuroGenomics · May 28, 2024 · 489d81f · 489d81f
1 parent 80cc40b
commit 489d81f
Show file tree

Hide file tree

Showing 13 changed files with 39 additions and 18 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,8 +1,8 @@
 Package: dreamlet
 Type: Package
 Title: Scalable differential expression analysis of single cell transcriptomics datasets with complex study designs
-Version: 1.1.23
-Date: 2024-05-16
+Version: 1.1.24
+Date: 2024-05-28
 Authors@R: person("Gabriel", "Hoffman", role=c("aut", "cre"), email="gabriel.hoffman@mssm.edu", comment=c(ORCID="0000-0002-0957-0224"))
 Description: Recent advances in single cell/nucleus transcriptomic technology has enabled collection of cohort-scale datasets to study cell type specific gene expression differences associated disease state, stimulus, and genetic regulation. The scale of these data, complex study designs, and low read count per cell mean that characterizing cell type specific molecular mechanisms requires a user-frieldly, purpose-build analytical framework. We have developed the dreamlet package that applies a pseudobulk approach and fits a regression model for each gene and cell cluster to test differential expression across individuals associated with a trait of interest. Use of precision-weighted linear mixed models enables accounting for repeated measures study designs, high dimensional batch effects, and varying sequencing depth or observed cells per biosample.
 VignetteBuilder: knitr

diff --git a/NEWS.md b/NEWS.md
@@ -1,4 +1,9 @@
 
+# dreamlet 1.1.24
+ - May 28, 2024
+ - `dreamlet()` gives clearer error message for singular design matrix
+ - `plotGeneHeatmap()` handles `zmax` correctly now
+
 # dreamlet 1.1.23
  - May 16, 2024
  - `processOneAssay`, set `rescaleWeightsAfter=FALSE` by default

diff --git a/R/dreamlet.R b/R/dreamlet.R
@@ -831,17 +831,21 @@ setMethod(
           fit <- NULL
         }
       } else {
-        fit <- NULL
+        fit <- NA
+        attr(fit, "error.initial") = "Design matrix is singular, covariates are very correlated"
       }
 
       if (!quiet) message(format(Sys.time() - startTime, digits = 2))
 
+      err.init = attr(fit, "error.initial")
+      if( !is(fit, "MArrayLM") && is.na(fit) ) fit <- NULL
+
       list(
         fit = fit,
         formula = form_mod,
         n_retain = ncol(geneExpr),
         errors = errorArray,
-        error.initial = attr(fit, "error.initial")
+        error.initial = err.init
       )
     })
     # name each result by the assay name

diff --git a/R/plotGeneHeatmap.R b/R/plotGeneHeatmap.R
@@ -90,6 +90,8 @@ setMethod(
       zmax <- max(abs(tab$z.std), na.rm = TRUE)
     } else {
       if (max(abs(tab$z.std), na.rm = TRUE) > zmax) {
+        tab$z.std = pmax(tab$z.std, -zmax)
+        tab$z.std = pmin(tab$z.std, zmax)
         warning("z.std > zmax", immediate. = TRUE)
       }
     }

diff --git a/R/plotVarPart.R b/R/plotVarPart.R
@@ -68,7 +68,7 @@ setMethod(
       xlab("") +
       scale_y_continuous(limits = c(0, 100), expand = c(0, 3)) +
       theme_classic() +
-      geom_boxplot(width = 0.07, fill = "grey", outlier.colour = "black") +
+      geom_boxplot(aes(outlier.colour = factor(variable)), width = 0.07, fill = "grey") +
       scale_fill_manual(values = col) +
       theme(
         legend.position = "none", plot.title = element_text(hjust = 0.5),
@@ -92,3 +92,5 @@ setMethod(
     fig
   }
 )
+
+
diff --git a/docs/404.html b/docs/404.html
diff --git a/docs/articles/non_lin_eff.html b/docs/articles/non_lin_eff.html
diff --git a/docs/authors.html b/docs/authors.html
diff --git a/docs/index.html b/docs/index.html
diff --git a/docs/news/index.html b/docs/news/index.html
diff --git a/docs/reference/index.html b/docs/reference/index.html
diff --git a/docs/reference/processOneAssay.html b/docs/reference/processOneAssay.html
diff --git a/man/processOneAssay.Rd b/man/processOneAssay.Rd