Skip to content

Use parallel package instead of multicore #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alko989 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use parallel package instead of multicore #9

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions DATRAS/R/ALKfuns.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ fitALK<-function(x,minAge,maxAge,mc.cores=1,model= c( "cra~LngtCm", "cra~poly(Ln
x[[1]]=subset(x[[1]],!is.na(Year) & !is.na(Age) & !is.na(LngtCm))

mylapply<-function(...){
hasmc=(mc.cores>1 && require(multicore,quietly=TRUE));
hasmc=(mc.cores>1 && require(parallel,quietly=TRUE));
if(!hasmc) return(lapply(...)) else return(mclapply(...,mc.cores=mc.cores))
}
if(verbose) cat("Fitting model...");
Expand All @@ -102,7 +102,7 @@ fitALK<-function(x,minAge,maxAge,mc.cores=1,model= c( "cra~LngtCm", "cra~poly(Ln
##' @param object An object of class 'ALKmodel'
##' @param newdata optionally, a DATRASraw object to predict
##' @param type the type of prediction required. The default is "Nage", which is numbers-at-age for each haul. The other option is "ALK", which gives a list of age-length keys, one for each haul.
##' @param mc.cores use this number of cores (parallel computation via multicore library)
##' @param mc.cores use this number of cores (parallel computation via \code{parallel} library)
##' @param ... unused
##' @return A matrix if type equals "Nage", and a list of matrices if type equals "ALK".
##' @export
Expand All @@ -118,7 +118,7 @@ predict.ALKmodel<-function(object,newdata=NULL,type="Nage",mc.cores=1,...){
len=attr(dat,"cm.breaks")[1:ncol(dat$N)];
N=length(len);
mylapply<-function(...){
hasmc=(mc.cores>1 && require(multicore,quietly=TRUE));
hasmc=(mc.cores>1 && require(parallel,quietly=TRUE));
if(!hasmc) return(lapply(...)) else return(mclapply(...,mc.cores=mc.cores))
}
if(type=="Nage"){
Expand Down