Merge branch 'master' of ssh://github.com/dmlc/xgboost

.travis.yml

@@ -1,5 +1,10 @@
 sudo: true
 
+# Enabling test on Linux and OS X
+os:
+  - linux
+  - osx
+
 # Use Build Matrix to do lint and build seperately
 env:
   matrix:

R-package/demo/custom_objective.R

@@ -57,9 +57,9 @@ logregobjattr <- function(preds, dtrain) {
   hess <- preds * (1 - preds)
   return(list(grad = grad, hess = hess))
 }
-
+param <- list(max.depth=2, eta=1, nthread = 2, silent=1, 
+              objective=logregobjattr, eval_metric=evalerror)
 print ('start training with user customized objective, with additional attributes in DMatrix')
 # training with customized objective, we can also do step by step training
 # simply look at xgboost.py's implementation of train
-bst <- xgb.train(param, dtrain, num_round, watchlist, 
-                 objective=logregobj, eval_metric=evalerror)
+bst <- xgb.train(param, dtrain, num_round, watchlist)