Merge pull request #8 from awsm-research/issue-7

Fix issue #7 doMC does not support Windows

DESCRIPTION

@@ -9,6 +9,7 @@ Authors@R: c(
 Maintainer: Chakkrit Tantithamthavorn <[email protected]>
 Imports: 
 	Hmisc,
+	car,
 	rms,
 	C50,
 	caret,
@@ -17,7 +18,7 @@ Imports:
 	reshape2,
 	foreign,
 	DMwR,
-	doMC,
+	doParallel,
 	ranger,
 	e1071,
 	foreach

NAMESPACE

@@ -13,13 +13,19 @@ import(dendextend)
 import(pROC)
 import(reshape2)
 importFrom(C50,C5.0)
+importFrom(C50,C5.0Control)
 importFrom(DMwR,SMOTE)
 importFrom(Hmisc,rcorr)
 importFrom(Hmisc,varclus)
+importFrom(car,Anova)
 importFrom(caret,createFolds)
 importFrom(caret,downSample)
 importFrom(caret,train)
+importFrom(caret,trainControl)
+importFrom(caret,twoClassSummary)
 importFrom(caret,upSample)
+importFrom(caret,varImp)
+importFrom(doParallel,registerDoParallel)
 importFrom(e1071,svm)
 importFrom(foreach,foreach)
 importFrom(foreign,read.arff)

R/fit.parallel.R

@@ -16,10 +16,12 @@
 #' @param validation.params a list of parameters for an input validation techniques (default: list(cv.k = 10, boot.n = 100))
 #' @param prob.threshold a numeric for probability threshold (default: 0.5)
 #' @param repeats a numeric for number of repetitions (default: 1)
+#' @param n.cores a numeric for number of cores (default: 2)
 #' @importFrom caret createFolds downSample upSample
 #' @importFrom DMwR SMOTE
 #' @importFrom foreach foreach
 #' @importFrom stats as.formula glm predict sd
+#' @importFrom doParallel registerDoParallel
 #' @keywords fit
 
 fit.parallel <-
@@ -49,7 +51,7 @@ fit.parallel <-
            repeats = 1,
            n.cores = 2) {
     # Init variables
-    registerDoMC(n.cores)
+    registerDoParallel(cores = n.cores)
     data.nrow <- nrow(data)
     outcome <- NULL
     if (!is.factor(data[, dep])) {

R/single.fit.R

@@ -10,11 +10,12 @@
 #' @param classifier.params a list of parameters for an input classifier technique
 #' @param params.tuning a boolean indicates whether to perform parameters tuning
 #' @param prob.threshold a numeric for probability threshold (default: 0.5)
-#' @importFrom caret train
-#' @importFrom C50 C5.0 
+#' @importFrom caret train trainControl varImp twoClassSummary 
+#' @importFrom C50 C5.0 C5.0Control
 #' @importFrom ranger ranger
 #' @importFrom e1071 svm
 #' @importFrom stats as.formula glm predict
+#' @importFrom car Anova
 #' @keywords fit
 #' @export
 single.fit <-