Fix R problem with empty data

Victorian-Bioinformatics-Consortium · Oct 6, 2017 · e7214d8 · e7214d8
1 parent ee7ab3e
commit e7214d8
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,3 +6,5 @@ dist/*
 test/.state/*
 doc/_*
 nesoni.egg-info
+*.sublime-*
+
diff --git a/nesoni/nesoni-r/DESCRIPTION b/nesoni/nesoni-r/DESCRIPTION
@@ -5,5 +5,13 @@ Title: Nesoni R component
 Description: The R component of the Nesoni toolsuite.
 Author: Paul Harrison
 Maintainer: Paul Harrison <[email protected]>
-Depends: limma, edgeR, Matrix, parallel
-Suggests: goseq, seriation, NMF
+Depends:
+    limma, 
+    edgeR, 
+    Matrix, 
+    parallel
+Suggests: 
+    goseq, 
+    seriation, 
+    NMF,
+    varistran
diff --git a/nesoni/nesoni-r/R/counts.R b/nesoni/nesoni-r/R/counts.R
@@ -10,6 +10,10 @@ read.counts <- function(filename, min.total=0, min.max=0, keep=NULL, norm.file=N
 
     data <- read.grouped.table(filename, require=c('Count'), default.group='Count')
     counts <- as.matrix( data$Count )
+
+    # Can happen with empty data
+    if (storage.mode(counts) == "logical")
+        storage.mode(counts) <- "numeric"
 
     gene <- data.frame(row.names=rownames(counts), locus_tag=rownames(counts))
 

diff --git a/nesoni/nesoni-r/R/fitnoise.R b/nesoni/nesoni-r/R/fitnoise.R
@@ -7,9 +7,9 @@
 #
 #
 
-library(Matrix)
-library(limma)  # EList class, p.adjust
-library(parallel)
+#library(Matrix)
+#library(limma)  # EList class, p.adjust
+#library(parallel)
 
 
 ##################################

diff --git a/nesoni/reference_directory.py b/nesoni/reference_directory.py
@@ -214,14 +214,14 @@ def run(self):
             reference.set_annotations(annotations)
 
         with legion.Stage() as stage:
+            if self.genome:
+                stage.process(reference.build_genome, self.genome_select)
+            if config.apply_ifavailable_program(self.bowtie, 'bowtie2-build'):
+                stage.process(reference.build_bowtie_index)
             if config.apply_ifavailable_program(self.ls, 'gmapper-ls'):
                 stage.process(reference.build_shrimp_mmap, False)
             if config.apply_ifavailable_program(self.cs, 'gmapper-cs'):
                 stage.process(reference.build_shrimp_mmap, True)
-            if config.apply_ifavailable_program(self.bowtie, 'bowtie2-build'):
-                stage.process(reference.build_bowtie_index)
-            if self.genome:
-                stage.process(reference.build_genome, self.genome_select)
             if config.apply_ifavailable_jar(self.snpeff, 'snpEff.jar'):
                 stage.process(reference.build_snpeff)