small change

This commit is contained in:
yepyao 2014-05-17 10:50:15 +08:00
parent e872f488a5
commit c4a783f408
2 changed files with 1 additions and 13 deletions

View File

@ -1,5 +1,5 @@
#Download the dataset from web site
#wget http://research.microsoft.com/en-us/um/beijing/projects/letor/LETOR4.0/Data/MQ2008.rar
wget http://research.microsoft.com/en-us/um/beijing/projects/letor/LETOR4.0/Data/MQ2008.rar
#please first install the unrar package
unrar x MQ2008

View File

@ -109,17 +109,6 @@ namespace xgboost{
namespace xgboost{
namespace regrank{
inline IObjFunction* CreateObjFunction( const char *name ){
<<<<<<< HEAD
if( !strcmp("reg", name ) ) return new RegressionObj();
if( !strcmp("rank:pairwise", name ) ) return new PairwiseRankObj();
if( !strcmp("rank:softmax", name ) ) return new SoftmaxRankObj();
if( !strcmp("softmax", name ) ) return new SoftmaxMultiClassObj();
if (!strcmp("rank:map", name)) return new LambdaRankObj_MAP();
if (!strcmp("rank:ndcg", name)) return new LambdaRankObj_NDCG();
utils::Error("unknown objective function type");
return NULL;
}
=======
if( !strcmp("reg:linear", name ) ) return new RegressionObj( LossType::kLinearSquare );
if( !strcmp("reg:logistic", name ) ) return new RegressionObj( LossType::kLogisticNeglik );
if( !strcmp("binary:logistic", name ) ) return new RegressionObj( LossType::kLogisticClassify );
@ -130,7 +119,6 @@ namespace xgboost{
utils::Error("unknown objective function type");
return NULL;
}
>>>>>>> 9eabb5c7f912a326005aca53a76c2e53a1661842
};
};
#endif