Merge branch 'hotfix/1.3.2_fix1'

epurdom · Sep 7, 2017 · 125b7aa · 125b7aa
2 parents 5cbfa27 + 63982c6
commit 125b7aa
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: clusterExperiment
 Title: Compare Clusterings for Single-Cell Sequencing 
-Version: 1.3.2
+Version: 1.3.3
 Description: Provides functionality for running and comparing many
     different clusterings of single-cell sequencing data or other large mRNA Expression data sets.
 Authors@R: c(person("Elizabeth", "Purdom", email = "epurdom@stat.berkeley.edu",

diff --git a/NEWS b/NEWS
@@ -1,3 +1,8 @@
+Changes in version 1.3.3 ( Release date: 2017-09-07)
+==============
+Changes:
+* Bug fix in clusterContrasts -- missing `match.arg` option for `outputType` argument
+
 Changes in version 1.3.2 ( Release date: 2017-07-05)
 ==============
 Changes:

diff --git a/R/clusterContrasts.R b/R/clusterContrasts.R
@@ -71,6 +71,7 @@ setMethod(f = "clusterContrasts",
           signature = "vector",
           definition = function(cluster,contrastType=c("Dendro", "Pairs", "OneAgainstAll"),
                                 dendro=NULL, pairMat=NULL,outputType=c("limma","MAST"),removeNegative=TRUE){
+		   outputType<-match.arg(outputType)
 		   if(outputType=="MAST" & !requireNamespace("MAST", quietly = TRUE)) stop("for outputType 'MAST', you must have package 'MAST' from Bioconductor installed.")
 
 		   cluster<-.convertToNum(cluster)