[Gmm-commits] r62 - in pkg/gmmExtra: . R

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

Author: chaussep
Date: 2012-10-15 16:59:30 +0200 (Mon, 15 Oct 2012)
New Revision: 62

Modified:
   pkg/gmmExtra/DESCRIPTION
   pkg/gmmExtra/R/KConfig.R
Log:
replaced the dependency on multicore by parralel

Modified: pkg/gmmExtra/DESCRIPTION
===================================================================
--- pkg/gmmExtra/DESCRIPTION	2012-09-22 14:48:45 UTC (rev 61)
+++ pkg/gmmExtra/DESCRIPTION	2012-10-15 14:59:30 UTC (rev 62)
@@ -5,8 +5,8 @@
 Author: Pierre Chausse <pchausse at uwaterloo.ca>
 Maintainer: Pierre Chausse <pchausse at uwaterloo.ca>
 Description: Tools for GMM such as additional tests or robust confidence regions. They only apply to gmm class object for the gmm package.
-Depends: R (>= 2.10.0), gmm (>= 1.4), multicore
-Suggests: mvtnorm, car, fBasics, MASS, timeDate, timeSeries
+Depends: R (>= 2.10.0), gmm (>= 1.4), parallel
+Suggests: mvtnorm, car, stabledist, MASS, timeDate, timeSeries
 Imports: stats
 License: GPL (>= 2)
 

Modified: pkg/gmmExtra/R/KConfig.R
===================================================================
--- pkg/gmmExtra/R/KConfig.R	2012-09-22 14:48:45 UTC (rev 61)
+++ pkg/gmmExtra/R/KConfig.R	2012-10-15 14:59:30 UTC (rev 62)
@@ -1,9 +1,6 @@
 KConfid <- function(obj, which, type = c("K", "KJ"), alpha = 0.05, alphaJ = 0.01, n = 4)
 	{
-	if (is.element("multicore", installed.packages()[,1])) 
-		theApply <- mclapply
-	else
-		theApply <- lapply
+	theApply <- mclapply
 
 	type <- match.arg(type)
 	if ( (obj$df == 0) & (type == "KJ"))
@@ -83,10 +80,7 @@
 
 .getCircle <- function(x0,y0,g,n,b, trace=FALSE,  ...)
 	{
-	if (is.element("multicore", installed.packages()[,1])) 
-		theApply <- mclapply
-	else
-		theApply <- lapply
+	theApply <- mclapply
 	tol=1e-4
 	if (any(b<=0))
 		stop("b must be strictly positive")