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

fix for loss_type problem in outside reset base

Browse Source
This commit is contained in:
tqchen 2014-05-16 21:28:03 -07:00
parent 8e941b2a79
commit baed0d0f08
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
regrank/xgboost_regrank.h
View File

@ -34,7 +34,7 @@ namespace xgboost{
RegRankBoostLearner(const std::vector<const DMatrix *>& mats){ RegRankBoostLearner(const std::vector<const DMatrix *>& mats){
silent = 0; silent = 0;
obj_ = NULL; obj_ = NULL;
name_obj_ = "reg"; name_obj_ = "reg:linear";
this->SetCacheData(mats); this->SetCacheData(mats);
} }
/*! /*!
@ -114,7 +114,7 @@ namespace xgboost{
*/ */
inline void InitModel(void){ inline void InitModel(void){
base_gbm.InitModel(); base_gbm.InitModel();
mparam.AdjustBase(); mparam.AdjustBase(name_obj_.c_str());
} }
/*! /*!
* \brief load model from file * \brief load model from file
@ -308,7 +308,7 @@ namespace xgboost{
/*! \brief constructor */ /*! \brief constructor */
ModelParam(void){ ModelParam(void){
base_score = 0.5f; base_score = 0.5f;
loss_type = 0; loss_type = -1;
num_feature = 0; num_feature = 0;
num_class = 0; num_class = 0;
memset(reserved, 0, sizeof(reserved)); memset(reserved, 0, sizeof(reserved));
@ -320,14 +320,19 @@ namespace xgboost{
*/ */
inline void SetParam(const char *name, const char *val){ inline void SetParam(const char *name, const char *val){
if (!strcmp("base_score", name)) base_score = (float)atof(val); if (!strcmp("base_score", name)) base_score = (float)atof(val);
if (!strcmp("loss_type", name)) loss_type = atoi(val);
if (!strcmp("num_class", name)) num_class = atoi(val); if (!strcmp("num_class", name)) num_class = atoi(val);
if (!strcmp("loss_type", name)) loss_type = atoi(val);
if (!strcmp("bst:num_feature", name)) num_feature = atoi(val); if (!strcmp("bst:num_feature", name)) num_feature = atoi(val);
} }
/*! /*!
* \brief adjust base_score * \brief adjust base_score based on loss type and objective function
*/ */
inline void AdjustBase(void){ inline void AdjustBase(const char *obj){
// some tweaks for loss type
if( loss_type == -1 ){
loss_type = 1;
if( !strcmp("reg:linear", obj ) ) loss_type = 0;
}
if (loss_type == 1 || loss_type == 2|| loss_type == 3){ if (loss_type == 1 || loss_type == 2|| loss_type == 3){
utils::Assert(base_score > 0.0f && base_score < 1.0f, "sigmoid range constrain"); utils::Assert(base_score > 0.0f && base_score < 1.0f, "sigmoid range constrain");
base_score = -logf(1.0f / base_score - 1.0f); base_score = -logf(1.0f / base_score - 1.0f);

1
regrank/xgboost_regrank_obj.h
View File

@ -20,6 +20,7 @@ namespace xgboost{
* \param val value of the parameter * \param val value of the parameter
*/ */
virtual void SetParam(const char *name, const char *val) = 0; virtual void SetParam(const char *name, const char *val) = 0;
/*! /*!
* \brief get gradient over each of predictions, given existing information * \brief get gradient over each of predictions, given existing information
* \param preds prediction of current round * \param preds prediction of current round