Browse code

Added error message when method != "gsva" and no.bootstraps > 0.

git-svn-id: file:///home/git/hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/GSVA@126404 bc3139a8-67e5-0310-9ffc-ced21a209358

Robert Castelo authored on 01/02/2017 16:53:30
Showing 2 changed files

... ...
@@ -1,8 +1,8 @@
1 1
 Package: GSVA
2
-Version: 1.23.3
2
+Version: 1.23.4
3 3
 Title: Gene Set Variation Analysis for microarray and RNA-seq data
4
-Author: Justin Guinney with contributions from Robert Castelo
5
-Maintainer: Justin Guinney <justin.guinney@sagebase.org>
4
+Authors@R: c(person("Justin", "Guinney", role=c("aut", "cre"), email="justin.guinney@sagebase.org"),
5
+             person("Robert", "Castelo", role="aut", email="robert.castelo@upf.edu"))
6 6
 Depends: R (>= 2.13.0)
7 7
 Imports: methods, BiocGenerics, Biobase, GSEABase (>= 1.17.4)
8 8
 Suggests: limma, RColorBrewer, genefilter, mclust,
... ...
@@ -266,6 +266,9 @@ setMethod("gsva", signature(expr="matrix", gset.idx.list="list"),
266 266
 	}
267 267
 	
268 268
   if (method == "ssgsea") {
269
+    if (no.bootstraps > 0)
270
+      stop("no.bootstraps > 0 does not work with method='ssgsea'")
271
+
269 272
 	  if(verbose)
270 273
 		  cat("Estimating ssGSEA scores for", length(gset.idx.list),"gene sets.\n")
271 274
 
... ...
@@ -275,6 +278,9 @@ setMethod("gsva", signature(expr="matrix", gset.idx.list="list"),
275 278
   }
276 279
 
277 280
   if (method == "zscore") {
281
+    if (no.bootstraps > 0)
282
+      stop("no.bootstraps > 0 does not work with method='zscore'")
283
+
278 284
     if (rnaseq)
279 285
       stop("rnaseq=TRUE does not work with method='zscore'.")
280 286
 
... ...
@@ -285,6 +291,9 @@ setMethod("gsva", signature(expr="matrix", gset.idx.list="list"),
285 291
   }
286 292
 
287 293
   if (method == "plage") {
294
+    if (no.bootstraps > 0)
295
+      stop("no.bootstraps > 0 does not work with method='plage'")
296
+
288 297
     if (rnaseq)
289 298
       stop("rnaseq=TRUE does not work with method='plage'.")
290 299