[Gmpm-commits] r20 - in pkg: . R

[noreply at r-forge.r-project.org]

Author: dalebarr
Date: 2013-02-22 09:28:57 +0100 (Fri, 22 Feb 2013)
New Revision: 20

Modified:
   pkg/DESCRIPTION
   pkg/R/gmpm.R
   pkg/R/helpers.R
Log:
changed calls to multicore to reference parallel library

Modified: pkg/DESCRIPTION
===================================================================
--- pkg/DESCRIPTION	2010-09-15 20:21:31 UTC (rev 19)
+++ pkg/DESCRIPTION	2013-02-22 08:28:57 UTC (rev 20)
@@ -1,10 +1,10 @@
 Package: gmpm
 Type: Package
 Title: Generalized Multilevel Permutation Models
-Version: 0.5-2
-Date: 2010-07-13
-Author: Dale Barr <d.barr at psy.gla.ac.uk>
-Maintainer: Dale Barr <d.barr at psy.gla.ac.uk>
+Version: 0.5-3
+Date: 2013-02-22
+Author: Dale Barr <dale.barr at glasgow.ac.uk>
+Maintainer: Dale Barr <dale.barr at glasgow.ac.uk>
 Description: Permutation methods for testing hypotheses on multilevel experimental data
 License: GPL (>=2)
 LazyLoad: yes

Modified: pkg/R/gmpm.R
===================================================================
--- pkg/R/gmpm.R	2010-09-15 20:21:31 UTC (rev 19)
+++ pkg/R/gmpm.R	2013-02-22 08:28:57 UTC (rev 20)
@@ -1401,7 +1401,7 @@
               listsize <- c(listsize, maxruns %% x at nCores)
             } else {}
 
-            if ("multicore" %in% installed.packages()) {
+            if ("parallel" %in% installed.packages()) {
               mycall <- "mclapply"
             } else {
               mycall <- "lapply"

Modified: pkg/R/helpers.R
===================================================================
--- pkg/R/helpers.R	2010-09-15 20:21:31 UTC (rev 19)
+++ pkg/R/helpers.R	2013-02-22 08:28:57 UTC (rev 20)
@@ -204,22 +204,22 @@
   if (is.null(gmpmControl[["nCores"]])) {
     nCores <- 1
   } else {
-    if ("multicore" %in% installed.packages()) {
-      library(multicore)
+    if ("parallel" %in% installed.packages()) {
+      library(parallel)
       if (gmpmControl[["nCores"]] == "all") {
-        nCores = multicore:::detectCores()
+        nCores = parallel:::detectCores()
         nCores = 1
       } else {
         if (gmpmControl[["nCores"]] == "all.but.one") {
-          nCores = multicore:::detectCores() - 1
+          nCores = parallel:::detectCores() - 1
           if (nCores <= 0) {
             warning("only one core available; 'all.but.one' option in gmpmControl was ignored")
             nCores = 1
           } else {}
         } else {
           if (is.numeric(gmpmControl[["nCores"]])) {
-            if (gmpmControl[["nCores"]] > multicore:::detectCores()) {
-              nCores = multicore:::detectCores()              
+            if (gmpmControl[["nCores"]] > parallel:::detectCores()) {
+              nCores = parallel:::detectCores()              
               warning("more processing cores requested (", gmpmControl[["nCores"]], ") than available (", nCores, "); using only the first ", nCores)
             } else {
               nCores = as.integer(gmpmControl[["nCores"]])