Merge pull request #82 from topepo/move-dots

Move dots leftward in model functions

Author: topepo

R/boost_tree.R

@@ -114,12 +114,12 @@
 
 boost_tree <-
   function(mode = "unknown",
+           ...,
            mtry = NULL, trees = NULL, min_n = NULL,
            tree_depth = NULL, learn_rate = NULL,
            loss_reduction = NULL,
            sample_size = NULL,
-           others = list(),
-           ...) {
+           others = list()) {
     check_empty_ellipse(...)
 
     if (!(mode %in% boost_tree_modes))

R/linear_reg.R

@@ -105,10 +105,10 @@
 #' @importFrom purrr map_lgl
 linear_reg <-
   function(mode = "regression",
+           ...,
            penalty = NULL,
            mixture = NULL,
-           others = list(),
-           ...) {
+           others = list()) {
     check_empty_ellipse(...)
     if (!(mode %in% linear_reg_modes))
       stop(

R/logistic_reg.R

@@ -103,10 +103,10 @@
 #' @importFrom purrr map_lgl
 logistic_reg <-
   function(mode = "classification",
+           ...,
            penalty = NULL,
            mixture = NULL,
-           others = list(),
-           ...) {
+           others = list()) {
     check_empty_ellipse(...)
     if (!(mode %in% logistic_reg_modes))
       stop(

R/mars.R

@@ -71,9 +71,9 @@
 
 mars <-
   function(mode = "unknown",
+           ...,
            num_terms = NULL, prod_degree = NULL, prune_method = NULL,
-           others = list(),
-           ...) {
+           others = list()) {
     check_empty_ellipse(...)
 
     if (!(mode %in% mars_modes))

R/mlp.R

@@ -93,10 +93,10 @@
 
 mlp <-
   function(mode = "unknown",
+           ...,
            hidden_units = NULL, penalty = NULL, dropout = NULL, epochs = NULL,
            activation = NULL,
-           others = list(),
-           ...) {
+           others = list()) {
     check_empty_ellipse(...)
 
     act_funs <- c("linear", "softmax", "relu", "elu")

R/multinom_reg.R

@@ -85,10 +85,10 @@
 #' @importFrom purrr map_lgl
 multinom_reg <-
   function(mode = "classification",
+           ...,
            penalty = NULL,
            mixture = NULL,
-           others = list(),
-           ...) {
+           others = list()) {
     check_empty_ellipse(...)
     if (!(mode %in% multinom_reg_modes))
       stop(

R/nearest_neighbor.R

@@ -77,11 +77,11 @@
 #'
 #' @export
 nearest_neighbor <- function(mode = "unknown",
+                             ...,
                              neighbors = NULL,
                              weight_func = NULL,
                              dist_power = NULL,
-                             others = list(),
-                             ...) {
+                             others = list()) {
 
   check_empty_ellipse(...)
 

R/rand_forest.R

@@ -103,9 +103,9 @@
 
 rand_forest <-
   function(mode = "unknown",
+           ...,
            mtry = NULL, trees = NULL, min_n = NULL,
-           others = list(),
-           ...) {
+           others = list()) {
     check_empty_ellipse(...)
 
     ## TODO: make a utility function here

R/surv_reg.R

@@ -20,7 +20,7 @@
 #'  Since survival models typically involve censoring (and require the use of
 #'  [survival::Surv()] objects), the [fit()] function will require that the
 #'  survival model be specified via the formula interface.
-#'  
+#'
 #' Also, for the `flexsurv::flexsurvfit` engine, the typical
 #'  `strata` function cannot be used. To achieve the same effect,
 #'  the extra parameter roles can be used (as described above).
@@ -51,9 +51,9 @@
 #' @export
 surv_reg <-
   function(mode = "regression",
+           ...,
            dist = NULL,
-           others = list(),
-           ...) {
+           others = list()) {
     check_empty_ellipse(...)
     if (!(mode %in% surv_reg_modes))
       stop(