diff --git a/man/calibrate.Rd b/man/calibrate.Rd index d7d7691..a4a8afe 100644 --- a/man/calibrate.Rd +++ b/man/calibrate.Rd @@ -66,7 +66,7 @@ calibrate(x, ...) \item{eps}{Cut-off value for density calculation. Default is 1e-5.} -\item{ncores}{Number of cores/workers used for parallel execution. Default is 1 (>1 requires doParallel package).} +\item{ncores}{Number of cores/workers used for parallel execution. Default is 1 (>1 requires doSnow package).} \item{verbose}{A logical variable indicating whether extra information on progress should be reported. Default is TRUE.} diff --git a/man/combine.Rd b/man/combine.Rd index 24d71ab..d9ba8f2 100644 --- a/man/combine.Rd +++ b/man/combine.Rd @@ -20,9 +20,9 @@ Combine multiple CalDates Class Objects into one. \examples{ x1 = calibrate(c(2000,3400),c(20,20),ids=1:2) -x2 = calibrate(c(4000,3000),c(30,30),calCurves=c('intcal13','marine13'), +x2 = calibrate(c(4000,3000),c(30,30),calCurves=c('intcal20','marine20'), resOffsets=c(0,30),resErrors=c(0,20),ids=3:4) -mcurve <- mixCurves('intcal13','marine13',p=0.7,resOffsets=300,resErrors=20) +mcurve <- mixCurves('intcal20','marine20',p=0.7,resOffsets=300,resErrors=20) x3 = calibrate(5300,20,calCurves=mcurve,ids=5) x = combine(x1,x2,x3) ## x$metadata diff --git a/man/sptest.Rd b/man/sptest.Rd index 6ab44fc..51efc37 100644 --- a/man/sptest.Rd +++ b/man/sptest.Rd @@ -90,7 +90,7 @@ bins=binPrep(sites=euroevol2$SiteID,ages=euroevol2$C14Age,h=200) calDates=calibrate(x=euroevol2$C14Age,errors=euroevol2$C14SD, timeRange=timeRange,normalised=FALSE) -## Main Analysis (over 2 cores; requires doParallel package) +## Main Analysis (over 2 cores; requires doSnow package) ## NOTE: the number of simulations should be ideally larger ## to ensure a better resolution of the p/q-values. res.locations=sptest(calDates,timeRange=timeRange,bins=bins,locations=locations,