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

right group size

Browse Source
This commit is contained in:
tqchen 2014-05-06 16:49:10 -07:00
parent c1223bfdef
commit c39e1f2f30
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
regrank/xgboost_regrank_data.h
View File

@ -113,6 +113,7 @@ namespace xgboost{
if( fs.Read(&ngptr, sizeof(unsigned) ) != 0 ){ if( fs.Read(&ngptr, sizeof(unsigned) ) != 0 ){
info.group_ptr.resize( ngptr ); info.group_ptr.resize( ngptr );
utils::Assert( fs.Read(&info.group_ptr[0], sizeof(unsigned) * ngptr) != 0, "Load group file"); utils::Assert( fs.Read(&info.group_ptr[0], sizeof(unsigned) * ngptr) != 0, "Load group file");
utils::Assert( info.group_ptr.back() == data.NumRow(), "number of group must match number of record" );
} }
} }
fs.Close(); fs.Close();
@ -123,7 +124,7 @@ namespace xgboost{
printf("%ux%u matrix with %lu entries is loaded from %s\n", printf("%ux%u matrix with %lu entries is loaded from %s\n",
(unsigned)data.NumRow(), (unsigned)data.NumCol(), (unsigned long)data.NumEntry(), fname); (unsigned)data.NumRow(), (unsigned)data.NumCol(), (unsigned long)data.NumEntry(), fname);
if( info.group_ptr.size() != 0 ){ if( info.group_ptr.size() != 0 ){
printf("data contains %u groups\n", (unsigned)info.group_ptr.size() ); printf("data contains %u groups\n", (unsigned)info.group_ptr.size()-1 );
} }
} }
this->TryLoadWeight(fname, silent); this->TryLoadWeight(fname, silent);
@ -143,7 +144,7 @@ namespace xgboost{
utils::Assert( info.labels.size() == data.NumRow(), "label size is not consistent with feature matrix size" ); utils::Assert( info.labels.size() == data.NumRow(), "label size is not consistent with feature matrix size" );
fs.Write(&info.labels[0], sizeof(float) * data.NumRow()); fs.Write(&info.labels[0], sizeof(float) * data.NumRow());
{// write out group ptr {// write out group ptr
unsigned ngptr = static_cast<unsigned>( info.group_ptr.size() ); unsigned ngptr = static_cast<unsigned>( info.group_ptr.size() );
fs.Write(&ngptr, sizeof(unsigned) ); fs.Write(&ngptr, sizeof(unsigned) );
fs.Write(&info.group_ptr[0], sizeof(unsigned) * ngptr); fs.Write(&info.group_ptr[0], sizeof(unsigned) * ngptr);
} }
@ -152,7 +153,7 @@ namespace xgboost{
printf("%ux%u matrix with %lu entries is saved to %s\n", printf("%ux%u matrix with %lu entries is saved to %s\n",
(unsigned)data.NumRow(), (unsigned)data.NumCol(), (unsigned long)data.NumEntry(), fname); (unsigned)data.NumRow(), (unsigned)data.NumCol(), (unsigned long)data.NumEntry(), fname);
if( info.group_ptr.size() != 0 ){ if( info.group_ptr.size() != 0 ){
printf("data contains %u groups\n", (unsigned)info.group_ptr.size() ); printf("data contains %u groups\n", (unsigned)info.group_ptr.size()-1 );
} }
} }
} }

3
regrank/xgboost_regrank_eval.h
View File

@ -160,7 +160,8 @@ namespace xgboost{
virtual float Eval(const std::vector<float> &preds, virtual float Eval(const std::vector<float> &preds,
const DMatrix::Info &info) const { const DMatrix::Info &info) const {
const std::vector<unsigned> &gptr = info.group_ptr; const std::vector<unsigned> &gptr = info.group_ptr;
utils::Assert(gptr.size() != 0 && gptr.back() == preds.size(), "EvalAuc: group structure must match number of prediction"); utils::Assert(gptr.size() != 0, "must specify group when constructing rank file");
utils::Assert( gptr.back() == preds.size(), "EvalRanklist: group structure must match number of prediction");
const unsigned ngroup = static_cast<unsigned>(gptr.size() - 1); const unsigned ngroup = static_cast<unsigned>(gptr.size() - 1);
double sum_metric = 0.0f; double sum_metric = 0.0f;