diff --git a/models/files/C5.0.R b/models/files/C5.0.R index 16a499531..237f51a43 100644 --- a/models/files/C5.0.R +++ b/models/files/C5.0.R @@ -39,7 +39,7 @@ modelInfo <- list(label = "C5.0", argList <- list(x = x, y = y, weights = wts, trials = param$trials, rules = param$model == "rules") argList <- c(argList, theDots) - do.call(C50::C5.0.default, argList) + do.call(C50:::C5.0.default, argList) }, predict = function(modelFit, newdata, submodels = NULL) { out <- predict(modelFit, newdata) @@ -76,7 +76,7 @@ modelInfo <- list(label = "C5.0", vars <- C50::C5imp(x, metric = "splits") rownames(vars)[vars$Overall > 0] }, - varImp = function(object, ...) C5imp(object, ...), + varImp = function(object, ...) C50::C5imp(object, ...), tags = c("Tree-Based Model", "Rule-Based Model", "Implicit Feature Selection", "Boosting", "Ensemble Model", "Handle Missing Predictor Data", "Accepts Case Weights"), sort = function(x) { diff --git a/models/files/C5.0Cost.R b/models/files/C5.0Cost.R index 71e496df1..50ed7e806 100644 --- a/models/files/C5.0Cost.R +++ b/models/files/C5.0Cost.R @@ -55,7 +55,7 @@ modelInfo <- list(label = "Cost-Sensitive C5.0", } else argList$costs <- cmat argList <- c(argList, theDots) - do.call(C50::C5.0.default, argList) + do.call(C50:::C5.0.default, argList) }, predict = function(modelFit, newdata, submodels = NULL) { out <- predict(modelFit, newdata) @@ -77,7 +77,7 @@ modelInfo <- list(label = "Cost-Sensitive C5.0", rownames(vars)[vars$Overall > 0] }, levels = function(x) x$obsLevels, - varImp = function(object, ...) C5imp(object, ...), + varImp = function(object, ...) C50::C5imp(object, ...), tags = c("Tree-Based Model", "Rule-Based Model", "Implicit Feature Selection", "Boosting", "Ensemble Model", "Cost Sensitive Learning", "Two Class Only", "Handle Missing Predictor Data", "Accepts Case Weights"), diff --git a/models/files/C5.0Rules.R b/models/files/C5.0Rules.R index d5453ca2a..b149183c1 100644 --- a/models/files/C5.0Rules.R +++ b/models/files/C5.0Rules.R @@ -7,7 +7,7 @@ modelInfo <- list(label = "Single C5.0 Ruleset", label = c('none')), grid = function(x, y, len = NULL, search = "grid") data.frame(parameter = "none"), fit = function(x, y, wts, param, lev, last, classProbs, ...) - C50::C5.0(x = x, y = y, weights = wts, rules = TRUE, ...), + C50:::C5.0.default(x = x, y = y, weights = wts, rules = TRUE, ...), predict = function(modelFit, newdata, submodels = NULL) predict(modelFit, newdata), prob = function(modelFit, newdata, submodels = NULL) @@ -17,7 +17,7 @@ modelInfo <- list(label = "Single C5.0 Ruleset", rownames(vars)[vars$Overall > 0] }, levels = function(x) x$obsLevels, - varImp = function(object, ...) C5imp(object, ...), + varImp = function(object, ...) C50::C5imp(object, ...), tags = c("Rule-Based Model", "Implicit Feature Selection", "Handle Missing Predictor Data", "Accepts Case Weights"), trim = function(x) { x$boostResults <- NULL diff --git a/models/files/C5.0Tree.R b/models/files/C5.0Tree.R index 88699bd8d..2258cd6c5 100644 --- a/models/files/C5.0Tree.R +++ b/models/files/C5.0Tree.R @@ -7,7 +7,7 @@ modelInfo <- list(label = "Single C5.0 Tree", label = c('none')), grid = function(x, y, len = NULL, search = "grid") data.frame(parameter = "none"), fit = function(x, y, wts, param, lev, last, classProbs, ...) - C50::C5.0(x = x, y = y, weights = wts, ...), + C50:::C5.0.default(x = x, y = y, weights = wts, ...), predict = function(modelFit, newdata, submodels = NULL) predict(modelFit, newdata), prob = function(modelFit, newdata, submodels = NULL) @@ -17,7 +17,7 @@ modelInfo <- list(label = "Single C5.0 Tree", rownames(vars)[vars$Overall > 0] }, levels = function(x) x$obsLevels, - varImp = function(object, ...) C5imp(object, ...), + varImp = function(object, ...) C50::C5imp(object, ...), tags = c("Tree-Based Model", "Implicit Feature Selection", "Handle Missing Predictor Data", "Accepts Case Weights"), sort = function(x) x[order(x[,1]),], diff --git a/pkg/caret/inst/models/models.RData b/pkg/caret/inst/models/models.RData index 8388771dc..acbf21fc1 100644 Binary files a/pkg/caret/inst/models/models.RData and b/pkg/caret/inst/models/models.RData differ