From c4a783f40827702bf4c8f10ffdabc288b8c50391 Mon Sep 17 00:00:00 2001 From: yepyao Date: Sat, 17 May 2014 10:50:15 +0800 Subject: [PATCH] small change --- demo/rank/runexp.sh | 2 +- regrank/xgboost_regrank_obj.h | 12 ------------ 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/demo/rank/runexp.sh b/demo/rank/runexp.sh index 305aef6b4..932fbb2a8 100755 --- a/demo/rank/runexp.sh +++ b/demo/rank/runexp.sh @@ -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 diff --git a/regrank/xgboost_regrank_obj.h b/regrank/xgboost_regrank_obj.h index 195646729..24396101b 100644 --- a/regrank/xgboost_regrank_obj.h +++ b/regrank/xgboost_regrank_obj.h @@ -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