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

allow nan as mssing

Browse Source
This commit is contained in:
tqchen 2014-11-20 13:14:04 -08:00
parent 076159cf7a
commit ed87eb61bd
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
wrapper/xgboost_wrapper.cpp
View File

@ -132,6 +132,7 @@ extern "C"{
bst_ulong nrow, bst_ulong nrow,
bst_ulong ncol, bst_ulong ncol,
float missing) { float missing) {
bool nan_missing = std::isnan(missing);
DMatrixSimple *p_mat = new DMatrixSimple(); DMatrixSimple *p_mat = new DMatrixSimple();
DMatrixSimple &mat = *p_mat; DMatrixSimple &mat = *p_mat;
mat.info.info.num_row = nrow; mat.info.info.num_row = nrow;
@ -139,9 +140,13 @@ extern "C"{
for (bst_ulong i = 0; i < nrow; ++i, data += ncol) { for (bst_ulong i = 0; i < nrow; ++i, data += ncol) {
bst_ulong nelem = 0; bst_ulong nelem = 0;
for (bst_ulong j = 0; j < ncol; ++j) { for (bst_ulong j = 0; j < ncol; ++j) {
if (data[j] != missing) { if (std::isnan(data[j])) {
mat.row_data_.push_back(RowBatch::Entry(j, data[j])); utils::Check(nan_missing, "There are NAN in the matrix, however, you did not set missing=NAN");
++nelem; } else {
if (nan_missing || data[j] != missing) {
mat.row_data_.push_back(RowBatch::Entry(j, data[j]));
++nelem;
}
} }
} }
mat.row_ptr_.push_back(mat.row_ptr_.back() + nelem); mat.row_ptr_.push_back(mat.row_ptr_.back() + nelem);