From 8473b18c3debcb45ce447db5c4615f74a228986e Mon Sep 17 00:00:00 2001
From: Vadim Khotilovich <khotilovich@gmail.com>
Date: Mon, 27 Jun 2016 01:50:03 -0500
Subject: [PATCH] [R] consolidate importFrom-s; parameter style

---
 R-package/NAMESPACE   | 13 +++++++------
 R-package/R/xgboost.R | 22 +++++++++++++++-------
 2 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/R-package/NAMESPACE b/R-package/NAMESPACE
index 63483d452..44f1d5c3c 100644
--- a/R-package/NAMESPACE
+++ b/R-package/NAMESPACE
@@ -12,11 +12,12 @@ S3method(slice,xgb.DMatrix)
 export("xgb.attr<-")
 export("xgb.attributes<-")
 export("xgb.parameters<-")
-export(cb.early_stop)
-export(cb.log_evaluation)
-export(cb.print_evaluation)
-export(cb.reset_parameters)
-export(cb.save_model)
+export(cb.cv.predict)
+export(cb.early.stop)
+export(cb.evaluation.log)
+export(cb.print.evaluation)
+export(cb.reset.parameters)
+export(cb.save.model)
 export(getinfo)
 export(print.xgb.Booster)
 export(print.xgb.DMatrix)
@@ -51,7 +52,6 @@ importFrom(Matrix,sparseVector)
 importFrom(data.table,":=")
 importFrom(data.table,as.data.table)
 importFrom(data.table,data.table)
-importFrom(data.table,fread)
 importFrom(data.table,rbindlist)
 importFrom(data.table,setnames)
 importFrom(magrittr,"%>%")
@@ -59,5 +59,6 @@ importFrom(stringr,str_detect)
 importFrom(stringr,str_extract)
 importFrom(stringr,str_match)
 importFrom(stringr,str_replace)
+importFrom(stringr,str_replace_all)
 importFrom(stringr,str_split)
 useDynLib(xgboost)
diff --git a/R-package/R/xgboost.R b/R-package/R/xgboost.R
index 5f9679c1a..e70be0e5c 100644
--- a/R-package/R/xgboost.R
+++ b/R-package/R/xgboost.R
@@ -5,8 +5,8 @@
 #' @export
 xgboost <- function(data = NULL, label = NULL, missing = NA, weight = NULL,
                     params = list(), nrounds,
-                    verbose = 1, print.every.n = 1L, 
-                    early.stop.round = NULL, maximize = NULL, 
+                    verbose = 1, print_every_n = 1L, 
+                    early_stopping_rounds = NULL, maximize = NULL, 
                     save_period = 0, save_name = "xgboost.model",
                     xgb_model = NULL, callbacks = list(), ...) {
 
@@ -16,8 +16,8 @@ xgboost <- function(data = NULL, label = NULL, missing = NA, weight = NULL,
   if (verbose > 0)
     watchlist$train = dtrain
 
-  bst <- xgb.train(params, dtrain, nrounds, watchlist, verbose = verbose, print.every.n=print.every.n,
-                   early.stop.round = early.stop.round, maximize = maximize,
+  bst <- xgb.train(params, dtrain, nrounds, watchlist, verbose = verbose, print_every_n=print_every_n,
+                   early_stopping_rounds = early_stopping_rounds, maximize = maximize,
                    save_period = save_period, save_name = save_name,
                    xgb_model = xgb_model, callbacks = callbacks, ...)
   return(bst)
@@ -79,15 +79,23 @@ NULL
 
 # Various imports
 #' @importClassesFrom Matrix dgCMatrix dgeMatrix
+#' @importFrom Matrix cBind
+#' @importFrom Matrix colSums
+#' @importFrom Matrix sparse.model.matrix
+#' @importFrom Matrix sparseVector
 #' @importFrom data.table data.table
 #' @importFrom data.table as.data.table
-#' @importFrom magrittr %>%
 #' @importFrom data.table :=
 #' @importFrom data.table rbindlist
+#' @importFrom data.table setnames
+#' @importFrom magrittr %>%
+#' @importFrom stringr str_detect
 #' @importFrom stringr str_extract
-#' @importFrom stringr str_split
-#' @importFrom stringr str_replace
 #' @importFrom stringr str_match
+#' @importFrom stringr str_replace
+#' @importFrom stringr str_replace_all
+#' @importFrom stringr str_split
+#' 
 #' @import methods
 #' @useDynLib xgboost
 NULL