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

Already on GitHub? Sign in to your account

replaced pROC metrics and optimized sections of code #482

Merged
merged 31 commits into from Sep 8, 2016
Commits
Jump to file or symbol
Failed to load files and symbols.
+211 −367
Split
View
@@ -44,7 +44,7 @@ before_install:
- ./travis-tool.sh r_binary_install nnet
- ./travis-tool.sh r_binary_install party
- ./travis-tool.sh r_binary_install pls
- - ./travis-tool.sh r_binary_install pROC
+ - ./travis-tool.sh r_install ModelMetrics
- ./travis-tool.sh r_binary_install proxy
- ./travis-tool.sh r_binary_install randomForest
- ./travis-tool.sh r_binary_install RANN
View
@@ -5,7 +5,7 @@ Title: Classification and Regression Training
Author: Max Kuhn. Contributions from Jed Wing, Steve Weston, Andre
Williams, Chris Keefer, Allan Engelhardt, Tony Cooper, Zachary Mayer,
Brenton Kenkel, the R Core Team, Michael Benesty, Reynald Lescarbeau,
- Andrew Ziem, Luca Scrucca, Yuan Tang, and Can Candan.
+ Andrew Ziem, Luca Scrucca, Yuan Tang, Can Candan, and Tyler Hunt.
Description: Misc functions for training and plotting classification and
regression models.
Maintainer: Max Kuhn <Max.Kuhn@pfizer.com>
@@ -20,6 +20,7 @@ Imports:
foreach,
methods,
plyr,
+ ModelMetrics (>= 1.1.0),
nlme,
reshape2,
stats,
@@ -44,7 +45,6 @@ Suggests:
nnet,
party (>= 0.9-99992),
pls,
- pROC (>= 1.8),
proxy,
randomForest,
RANN,
View
@@ -1,24 +1,27 @@
useDynLib(caret)
+importFrom(ModelMetrics, auc)
import(foreach, methods, plyr, reshape2, ggplot2, lattice, nlme)
importFrom(car, powerTransform, yjPower)
importFrom(grDevices, extendrange)
-importFrom(stats, .checkMFClasses, .getXlevels, aggregate, anova,
- approx, as.formula, binom.test, complete.cases, contrasts,
- cor, cov, delete.response, dist,
- fitted.values, loess, mahalanobis,
- mcnemar.test, median, model.frame, model.matrix,
- model.response, model.weights, na.fail, na.pass, optim,
- predict, qnorm, quantile, rbinom, reshape, resid,
- residuals, rnorm, runif, sd, t.test, terms,
+importFrom(stats, .checkMFClasses, .getXlevels, aggregate, anova,
+ approx, as.formula, binom.test, complete.cases, contrasts,
+ cor, cov, delete.response, dist,
+ fitted.values, loess, mahalanobis,
+ mcnemar.test, median, model.frame, model.matrix,
+ model.response, model.weights, na.fail, na.pass, optim,
+ predict, qnorm, quantile, rbinom, reshape, resid,
+ residuals, rnorm, runif, sd, t.test, terms,
toeplitz, var, na.omit, p.adjust, fitted, prcomp, hclust,
- lm, model.extract, pt, update, binomial)
-importFrom(stats4, coef)
-importFrom(utils, capture.output, getFromNamespace, head,
- install.packages, installed.packages, object.size, flush.console, menu, stack)
+ lm, model.extract, pt, update, binomial)
+importFrom(stats4, coef)
+importFrom(utils, capture.output, getFromNamespace, head,
+ install.packages, installed.packages, object.size, flush.console, menu, stack,
+ modifyList, combn
+ )
export(anovaScores,
as.data.frame.resamples,
- as.matrix.resamples,
+ as.matrix.resamples,
avNNet,
avNNet.default,
bag,
@@ -73,7 +76,7 @@ export(anovaScores,
extractProb,
F_meas,
F_meas.default,
- F_meas.table,
+ F_meas.table,
featurePlot,
filterVarImp,
findCorrelation,
@@ -87,7 +90,7 @@ export(anovaScores,
gafs_spCrossover,
gafs_raMutation,
gafs,
- gafs.default,
+ gafs.default,
gafsControl,
gamFormula,
gamFuncs,
@@ -143,7 +146,7 @@ export(anovaScores,
nullModel,
nullModel.default,
oneSE,
- panel.calibration,
+ panel.calibration,
panel.lift,
panel.lift2,
panel.needle,
@@ -196,7 +199,7 @@ export(anovaScores,
R2,
recall,
recall.default,
- recall.table,
+ recall.table,
resampleHist,
resamples,
resamples.default,
@@ -207,16 +210,16 @@ export(anovaScores,
rfeControl,
rfeIter,
rfFuncs,
- rfGA,
+ rfGA,
rfSA,
rfSBF,
rfStats,
RMSE,
safs_initial,
- safs_perturb,
+ safs_perturb,
safs_prob,
safs,
- safs.default,
+ safs.default,
safsControl,
sbf,
sbf.default,
@@ -339,7 +342,7 @@ S3method(varImp, nnet)
S3method(varImp, glmnet)
S3method(varImp, gam)
S3method(varImp, gafs)
-S3method(varImp, safs)
+S3method(varImp, safs)
S3method(densityplot, train)
S3method(histogram, train)
@@ -377,7 +380,7 @@ S3method(plot, prcomp.resamples)
S3method(plot, lift)
S3method(plot, calibration)
S3method(plot, gafs)
-S3method(plot, safs)
+S3method(plot, safs)
S3method(confusionMatrix, train)
S3method(confusionMatrix, rfe)
@@ -418,7 +421,7 @@ S3method(print, lift)
S3method(print, calibration)
S3method(print, expoTrans)
S3method(print, gafs)
-S3method(print, safs)
+S3method(print, safs)
S3method(predict, plsda)
S3method(predict, splsda)
@@ -441,7 +444,7 @@ S3method(predict, dummyVars)
S3method(predict, BoxCoxTrans)
S3method(predict, expoTrans)
S3method(predict, gafs)
-S3method(predict, safs)
+S3method(predict, safs)
S3method(summary, bagEarth)
S3method(summary, bagFDA)
@@ -459,7 +462,7 @@ S3method(predictors, default)
S3method(predictors, rfe)
S3method(predictors, sbf)
S3method(predictors, gafs)
-S3method(predictors, safs)
+S3method(predictors, safs)
S3method(confusionMatrix, table)
@@ -492,7 +495,7 @@ S3method(summary, diff.resamples)
S3method(update, train)
S3method(update, rfe)
S3method(update, gafs)
-S3method(update, safs)
+S3method(update, safs)
S3method(fitted, train)
S3method(residuals, train)
@@ -510,7 +513,7 @@ S3method(oob_pred, sbf)
S3method(oob_pred, list)
S3method(gafs, default)
-S3method(safs, default)
+S3method(safs, default)
S3method(trim, train)
Oops, something went wrong.