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

Merge pull request #557 from shimo-t/patch

Browse Source 
fix training.py and sklearn.py for evals_result in python3
This commit is contained in:
Tianqi Chen 2015-10-23 09:55:50 -07:00
commit 36927632c5
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
python-package/xgboost/sklearn.py
View File

@ -190,7 +190,7 @@ class XGBModel(XGBModelBase):
if evals_result: if evals_result:
for val in evals_result.items(): for val in evals_result.items():
evals_result_key = val[1].keys()[0] evals_result_key = list(val[1].keys())[0]
evals_result[val[0]][evals_result_key] = val[1][evals_result_key] evals_result[val[0]][evals_result_key] = val[1][evals_result_key]
self.evals_result_ = evals_result self.evals_result_ = evals_result
@ -341,7 +341,7 @@ class XGBClassifier(XGBModel, XGBClassifierBase):
if evals_result: if evals_result:
for val in evals_result.items(): for val in evals_result.items():
evals_result_key = val[1].keys()[0] evals_result_key = list(val[1].keys())[0]
evals_result[val[0]][evals_result_key] = val[1][evals_result_key] evals_result[val[0]][evals_result_key] = val[1][evals_result_key]
self.evals_result_ = evals_result self.evals_result_ = evals_result

4
python-package/xgboost/training.py
View File

@ -78,7 +78,7 @@ def train(params, dtrain, num_boost_round=10, evals=(), obj=None, feval=None,
res = re.findall("([0-9a-zA-Z@]+[-]*):-?([0-9.]+).", msg) res = re.findall("([0-9a-zA-Z@]+[-]*):-?([0-9.]+).", msg)
for key in evals_name: for key in evals_name:
evals_idx = evals_name.index(key) evals_idx = evals_name.index(key)
res_per_eval = len(res) / len(evals_name) res_per_eval = len(res) // len(evals_name)
for r in range(res_per_eval): for r in range(res_per_eval):
res_item = res[(evals_idx*res_per_eval) + r] res_item = res[(evals_idx*res_per_eval) + r]
res_key = res_item[0] res_key = res_item[0]
@ -135,7 +135,7 @@ def train(params, dtrain, num_boost_round=10, evals=(), obj=None, feval=None,
res = re.findall("([0-9a-zA-Z@]+[-]*):-?([0-9.]+).", msg) res = re.findall("([0-9a-zA-Z@]+[-]*):-?([0-9.]+).", msg)
for key in evals_name: for key in evals_name:
evals_idx = evals_name.index(key) evals_idx = evals_name.index(key)
res_per_eval = len(res) / len(evals_name) res_per_eval = len(res) // len(evals_name)
for r in range(res_per_eval): for r in range(res_per_eval):
res_item = res[(evals_idx*res_per_eval) + r] res_item = res[(evals_idx*res_per_eval) + r]
res_key = res_item[0] res_key = res_item[0]