Skip to content

Commit 3bd092a

Browse files
committed
fix MeanVarPlot edge case, fix NegBinomDETest missing fmla
1 parent 4cce113 commit 3bd092a

2 files changed

Lines changed: 5 additions & 4 deletions

File tree

DESCRIPTION

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Package: Seurat
2-
Version: 1.4.0.15
3-
Date: 5/17/2017
2+
Version: 1.4.0.16
3+
Date: 5/23/2017
44
Title: Seurat : R toolkit for single cell genomics
55
Description: Seurat : R toolkit for single cell genomics.
66
Author: Rahul Satija

R/seurat.R

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2162,9 +2162,10 @@ setMethod("NegBinomDETest", "seurat",
21622162
warning(paste0("Skipping gene --", x, ". No variance in expression between the two clusters.", sep = " "))
21632163
return(2)
21642164
}
2165+
fmla <- as.formula(paste0("GENE ", " ~ ", paste(latent.vars, collapse = "+")))
21652166
p.estimate <- 2
21662167
try(p.estimate <- summary(glm.nb(fmla,data = to.test))$coef[2,4], silent = T)
2167-
return(summary(glm.nb(fmla,data = to.test))$coef[2,4])
2168+
return(p.estimate)
21682169
}))
21692170
if(length(which(p_val == 2)) > 0){
21702171
genes.use <- genes.use[-which(p_val==2)]
@@ -4518,7 +4519,7 @@ setMethod("MeanVarPlot", signature = "seurat",
45184519
for(i in 1:max.bin) {
45194520
my.inds <- ((bin.size * (i - 1)):(bin.size * i - 1))+1
45204521
my.inds <- my.inds[my.inds <= length(genes.use)]
4521-
genes.iter=genes.use[my.inds]; data.iter=data[genes.iter,]
4522+
genes.iter=genes.use[my.inds]; data.iter=data[genes.iter,, drop = F]
45224523
data.x[genes.iter]=apply(data.iter,1,fxn.x); data.y[genes.iter]=apply(data.iter,1,fxn.y)
45234524
setTxtProgressBar(pb, i)
45244525
}

0 commit comments

Comments
 (0)