package multicore -> package parallel

.gitignore

@@ -3,3 +3,4 @@
 
 # Example code in package build process
 *-Ex.R
+.Rproj.user

DESCRIPTION

@@ -7,6 +7,6 @@ Maintainer: Francois Pelletier <francois@francoispelletier.org>
 Description: This is a package gathering different functions to work with the
     characteristic function and Fourier transforms
 Depends:
-    actuar,MASS,multicore
+    actuar,MASS,parallel
 LazyLoad: yes
 License: LGPL-3

FourierStuff.Rproj

@@ -0,0 +1,17 @@
+Version: 1.0
+
+RestoreWorkspace: Default
+SaveWorkspace: Default
+AlwaysSaveHistory: Default
+
+EnableCodeIndexing: Yes
+UseSpacesForTab: Yes
+NumSpacesForTab: 2
+Encoding: UTF-8
+
+RnwWeave: Sweave
+LaTeX: pdfLaTeX
+
+BuildType: Package
+PackageUseDevtools: Yes
+PackageInstallArgs: --no-multiarch --with-keep.source

R/cftocdf.R

@@ -24,7 +24,7 @@ cftocdf <- function(grid,char.fun,...,wmin=0,wmax=50,MSwindows=FALSE)
 	# Integrate for each grid point using parallel computation if available
 	if(!MSwindows)
 	{
-		return(unlist(multicore::mclapply(grid,
+		return(unlist(mclapply(grid,
 					function(x) 1/2-1/pi*
 								integrate(integrand,wmin,wmax,x,char.fun,...)$value)))
 	}