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

This commit is contained in:
tqchen 2014-09-06 22:20:18 -07:00
commit 014e830a04
5 changed files with 43 additions and 10 deletions

View File

@ -69,10 +69,10 @@ xgboost <- function(data = NULL, label = NULL, params = list(), nrounds,
#' #'
#' \itemize{ #' \itemize{
#' \item \code{label} the label for each record #' \item \code{label} the label for each record
#' \item \code{data} a sparse Matrix of \code{dgCMatrix} class, with 127 rows. #' \item \code{data} a sparse Matrix of \code{dgCMatrix} class, with 127 columns.
#' } #' }
#' #'
#'#' @references #' @references
#' https://archive.ics.uci.edu/ml/datasets/Mushroom #' https://archive.ics.uci.edu/ml/datasets/Mushroom
#' #'
#' Bache, K. & Lichman, M. (2013). UCI Machine Learning Repository #' Bache, K. & Lichman, M. (2013). UCI Machine Learning Repository
@ -96,7 +96,7 @@ NULL
#' #'
#' \itemize{ #' \itemize{
#' \item \code{label} the label for each record #' \item \code{label} the label for each record
#' \item \code{data} a sparse Matrix of \code{dgCMatrix} class, with 127 rows. #' \item \code{data} a sparse Matrix of \code{dgCMatrix} class, with 127 columns.
#' } #' }
#' #'
#' @references #' @references

View File

@ -0,0 +1,31 @@
% Generated by roxygen2 (4.0.1): do not edit by hand
\docType{data}
\name{agaricus.test}
\alias{agaricus.test}
\title{Test part from Mushroom Data Set}
\format{A list containing a label vector, and a dgCMatrix object with 1611
rows and 127 variables}
\usage{
data(agaricus.test)
}
\description{
This data set is originally from the Mushroom data set,
UCI Machine Learning Repository.
}
\details{
This data set includes the following fields:
\itemize{
\item \code{label} the label for each record
\item \code{data} a sparse Matrix of \code{dgCMatrix} class, with 127 columns.
}
}
\references{
https://archive.ics.uci.edu/ml/datasets/Mushroom
Bache, K. & Lichman, M. (2013). UCI Machine Learning Repository
[http://archive.ics.uci.edu/ml]. Irvine, CA: University of California,
School of Information and Computer Science.
}
\keyword{datasets}

View File

@ -17,10 +17,8 @@ This data set includes the following fields:
\itemize{ \itemize{
\item \code{label} the label for each record \item \code{label} the label for each record
\item \code{data} a sparse Matrix of \code{dgCMatrix} class, with 127 rows. \item \code{data} a sparse Matrix of \code{dgCMatrix} class, with 127 columns.
} }
#'
} }
\references{ \references{
https://archive.ics.uci.edu/ml/datasets/Mushroom https://archive.ics.uci.edu/ml/datasets/Mushroom

View File

@ -6,7 +6,7 @@
xgb.DMatrix.save(DMatrix, fname) xgb.DMatrix.save(DMatrix, fname)
} }
\arguments{ \arguments{
\item{DMatrix}{the model object.} \item{DMatrix}{the DMatrix object}
\item{fname}{the name of the binary file.} \item{fname}{the name of the binary file.}
} }

View File

@ -45,8 +45,12 @@ Parallelization is automatically enabled if OpenMP is present.
Number of threads can also be manually specified via "nthread" parameter Number of threads can also be manually specified via "nthread" parameter
} }
\examples{ \examples{
data(iris) data(agaricus.train, package='xgboost')
bst <- xgboost(as.matrix(iris[,1:4]),as.numeric(iris[,5]=='setosa'), nrounds = 2) data(agaricus.test, package='xgboost')
pred <- predict(bst, as.matrix(iris[,1:4])) train <- agaricus.train
test <- agaricus.test
bst <- xgboost(data = train$data, label = train$label, max.depth = 2,
eta = 1, nround = 2,objective = "binary:logistic")
pred <- predict(bst, test$data)
} }