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

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

Author: dalebarr
Date: 2010-07-13 21:10:47 +0200 (Tue, 13 Jul 2010)
New Revision: 18

Modified:
   pkg/DESCRIPTION
   pkg/R/helpers.R
Log:
fixed bug for platforms without 'multicore' package installed

Modified: pkg/DESCRIPTION
===================================================================
--- pkg/DESCRIPTION	2010-06-10 17:35:17 UTC (rev 17)
+++ pkg/DESCRIPTION	2010-07-13 19:10:47 UTC (rev 18)
@@ -1,8 +1,8 @@
 Package: gmpm
 Type: Package
 Title: Generalized Multilevel Permutation Models
-Version: 0.5-1
-Date: 2010-06-10
+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>
 Description: Permutation methods for testing hypotheses on multilevel experimental data

Modified: pkg/R/helpers.R
===================================================================
--- pkg/R/helpers.R	2010-06-10 17:35:17 UTC (rev 17)
+++ pkg/R/helpers.R	2010-07-13 19:10:47 UTC (rev 18)
@@ -201,8 +201,6 @@
 }
 
 .calculateCores <- function(gmpmControl = list()) {
-  nCores <- 1
-
   if (is.null(gmpmControl[["nCores"]])) {
     nCores <- 1
   } else {
@@ -230,8 +228,10 @@
           }
         }
       }
-    } else {}
+    } else {
+      nCores = 1
+    }
   }
-  
-  return(nCores)
+
+  return(as.integer(nCores))
 }