Changed nei.efdr to ignore parallelisation

andrewzm · Jan 15, 2015 · df9a42f · df9a42f
1 parent c07ee18
commit df9a42f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: EFDR
 Type: Package
 Title: Wavelet-Based Enhanced FDR for Signal Detection in Noisy Images
-Version: 0.1.0
+Version: 0.1.1
 Date: 2014-10-22
 Authors@R: c(person("Andrew", "Zammit-Mangion", role = c("aut", "cre"),
     email = "andrewzm@gmail.com"),

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,7 @@
+# v0.1.1
+
+* Disabled parallelisation from nei.efdr() as this was being very slow. No changes to user
+
 # v0.1.0
 
 First upload to CRAN. Enjoy!
diff --git a/R/EFDR_functions.R b/R/EFDR_functions.R
@@ -530,6 +530,9 @@ diagnostic.table <- function(reject.true,reject, n) {
 nei.efdr <- function(Z,wf="la8",J=3,b=11,parallel=1L) {
 
   .check_args(Z=Z,wf=wf,J=J,b=b,parallel=parallel)
+  if(parallel > 1L) cat("Argument 'parallel' is deprecated for nei.efdr() since v0.1.1")
+  parallel <- 1L
+
   dwt.z <- dwt.2d(x=Z,wf=wf,J=J)  
   layers <- .flat.pack(dwt.z,b=b)