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

remove using std from cpp

Browse Source
This commit is contained in:
tqchen
2014-09-02 22:43:19 -07:00
parent 1dbcebb6fe
commit 10648a1ca7
19 changed files with 53 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/gbm/gblinear-inl.hpp
View File

@@ -24,6 +24,7 @@ class GBLinear : public IGradBooster {
}
// set model parameters
virtual void SetParam(const char *name, const char *val) {
using namespace std;
if (!strncmp(name, "bst:", 4)) {
param.SetParam(name + 4, val);
}
@@ -166,6 +167,7 @@ class GBLinear : public IGradBooster {
learning_rate = 1.0f;
}
inline void SetParam(const char *name, const char *val) {
using namespace std;
// sync-names
if (!strcmp("eta", name)) learning_rate = static_cast<float>(atof(val));
if (!strcmp("lambda", name)) reg_lambda = static_cast<float>(atof(val));
@@ -207,9 +209,10 @@ class GBLinear : public IGradBooster {
Param(void) {
num_feature = 0;
num_output_group = 1;
memset(reserved, 0, sizeof(reserved));
std::memset(reserved, 0, sizeof(reserved));
}
inline void SetParam(const char *name, const char *val) {
using namespace std;
if (!strcmp(name, "bst:num_feature")) num_feature = atoi(val);
if (!strcmp(name, "num_output_group")) num_output_group = atoi(val);
}

2
src/gbm/gbm.cpp
View File

@@ -1,7 +1,6 @@
#define _CRT_SECURE_NO_WARNINGS
#define _CRT_SECURE_NO_DEPRECATE
#include <cstring>
using namespace std;
#include "./gbm.h"
#include "./gbtree-inl.hpp"
#include "./gblinear-inl.hpp"
@@ -9,6 +8,7 @@ using namespace std;
namespace xgboost {
namespace gbm {
IGradBooster* CreateGradBooster(const char *name) {
using namespace std;
if (!strcmp("gbtree", name)) return new GBTree();
if (!strcmp("gblinear", name)) return new GBLinear();
utils::Error("unknown booster type: %s", name);

9
src/gbm/gbtree-inl.hpp
View File

@@ -23,6 +23,7 @@ class GBTree : public IGradBooster {
this->Clear();
}
virtual void SetParam(const char *name, const char *val) {
using namespace std;
if (!strncmp(name, "bst:", 4)) {
cfg.push_back(std::make_pair(std::string(name+4), std::string(val)));
// set into updaters, if already intialized
@@ -171,14 +172,14 @@ class GBTree : public IGradBooster {
updaters.clear();
std::string tval = tparam.updater_seq;
char *pstr;
pstr = strtok(&tval[0], ",");
pstr = std::strtok(&tval[0], ",");
while (pstr != NULL) {
updaters.push_back(tree::CreateUpdater(pstr));
for (size_t j = 0; j < cfg.size(); ++j) {
// set parameters
updaters.back()->SetParam(cfg[j].first.c_str(), cfg[j].second.c_str());
}
pstr = strtok(NULL, ",");
pstr = std::strtok(NULL, ",");
}
tparam.updater_initialized = 1;
}
@@ -279,6 +280,7 @@ class GBTree : public IGradBooster {
updater_initialized = 0;
}
inline void SetParam(const char *name, const char *val){
using namespace std;
if (!strcmp(name, "updater") &&
strcmp(updater_seq.c_str(), val) != 0) {
updater_seq = val;
@@ -319,7 +321,7 @@ class GBTree : public IGradBooster {
num_pbuffer = 0;
num_output_group = 1;
size_leaf_vector = 0;
memset(reserved, 0, sizeof(reserved));
std::memset(reserved, 0, sizeof(reserved));
}
/*!
* \brief set parameters from outside
@@ -327,6 +329,7 @@ class GBTree : public IGradBooster {
* \param val value of the parameter
*/
inline void SetParam(const char *name, const char *val) {
using namespace std;
if (!strcmp("num_pbuffer", name)) num_pbuffer = atol(val);
if (!strcmp("num_output_group", name)) num_output_group = atol(val);
if (!strcmp("bst:num_roots", name)) num_roots = atoi(val);