Hendrik/xgboost
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bugfix booster.check

Browse Source
This commit is contained in:
tqchen 2015-03-26 16:43:01 -07:00
parent 23e46b7fa5
commit 98618646f6
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
R-package/R/utils.R
View File

@ -87,8 +87,12 @@ xgb.handleToBooster <- function(handle)
# Check whether an xgb.Booster object is complete # Check whether an xgb.Booster object is complete
xgb.Booster.check <- function(bst, saveraw = TRUE) xgb.Booster.check <- function(bst, saveraw = TRUE)
{ {
if (is.null(bst$handle)) { isnull <- is.null(bst$handle)
bst$handle <- xgb.load(bst$raw) if (!isnull) {
isnull <- .Call("XGCheckNullPtr_R", bst$handle, PACKAGE="xgboost")
}
if (isnull) {
bst$handle <- xgb.Booster(modelfile = bst$raw)
} else { } else {
if (is.null(bst$raw) && saveraw) if (is.null(bst$raw) && saveraw)
bst$raw <- xgb.save.raw(bst$handle) bst$raw <- xgb.save.raw(bst$handle)

3
R-package/src/xgboost_R.cpp
View File

@ -59,6 +59,9 @@ inline void _WrapperEnd(void) {
} }
extern "C" { extern "C" {
SEXP XGCheckNullPtr_R(SEXP handle) {
return ScalarLogical(R_ExternalPtrAddr(handle) == NULL);
}
void _DMatrixFinalizer(SEXP ext) { void _DMatrixFinalizer(SEXP ext) {
if (R_ExternalPtrAddr(ext) == NULL) return; if (R_ExternalPtrAddr(ext) == NULL) return;
XGDMatrixFree(R_ExternalPtrAddr(ext)); XGDMatrixFree(R_ExternalPtrAddr(ext));

6
R-package/src/xgboost_R.h
View File

@ -11,6 +11,12 @@ extern "C" {
} }
extern "C" { extern "C" {
/*!
* \brief check whether a handle is NULL
* \param handle
* \return whether it is null ptr
*/
SEXP XGCheckNullPtr_R(SEXP handle);
/*! /*!
* \brief load a data matrix * \brief load a data matrix
* \param fname name of the content * \param fname name of the content