Browse code

Fixed bugs when input is a sparse matrix

Joshua D. Campbell authored on 17/07/2021 13:56:39
Showing 4 changed files

... ...
@@ -188,7 +188,7 @@ setMethod("celda_C",
188 188
         verbose = TRUE) {
189 189
 
190 190
         # Convert to sparse matrix
191
-        x <- as(x, "dgCMatrix")
191
+        x <- methods::as(x, "dgCMatrix")
192 192
         
193 193
         ls <- list()
194 194
         ls[[useAssay]] <- x
... ...
@@ -222,7 +222,7 @@ setMethod("celda_CG",
222 222
         verbose = TRUE) {
223 223
 
224 224
         # Convert to sparse matrix
225
-        x <- as(x, "dgCMatrix")
225
+        x <- methods::as(x, "dgCMatrix")
226 226
       
227 227
         ls <- list()
228 228
         ls[[useAssay]] <- x
... ...
@@ -172,7 +172,7 @@ setMethod("celda_G",
172 172
         verbose = TRUE) {
173 173
 
174 174
         # Convert to sparse matrix
175
-        x <- as(x, "dgCMatrix")
175
+        x <- methods::as(x, "dgCMatrix")
176 176
       
177 177
         ls <- list()
178 178
         ls[[useAssay]] <- x
... ...
@@ -313,10 +313,7 @@
313 313
   rm(p)
314 314
 
315 315
   # Pre-compute lgamma values
316
-  lgbeta <- lgamma((seq(0, max(.colSums(
317
-    counts, nrow(counts),
318
-    ncol(counts)
319
-  )))) + beta)
316
+  lgbeta <- lgamma((seq(0, max(colSums(counts)))) + beta)
320 317
   lggamma <- lgamma(seq(0, nrow(counts) + L) + gamma)
321 318
   lgdelta <- c(NA, lgamma(seq(nrow(counts) + L) * delta))
322 319