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

changed the param show_progress by verbose_eval in cv and aggcv functions

Browse Source
This commit is contained in:
ivallesp 2016-02-21 01:28:55 +01:00
parent 532615a32a
commit c17d0ef560
1 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -295,14 +295,14 @@ def mknfold(dall, nfold, param, seed, evals=(), fpreproc=None, stratified=False,
ret.append(CVPack(dtrain, dtest, plst)) ret.append(CVPack(dtrain, dtest, plst))
return ret return ret
def aggcv(rlist, show_stdv=True, show_progress=None, as_pandas=True, trial=0): def aggcv(rlist, show_stdv=True, verbose_eval=None, as_pandas=True, trial=0):
# pylint: disable=invalid-name # pylint: disable=invalid-name
""" """
Aggregate cross-validation results. Aggregate cross-validation results.
If show_progress is true, progress is displayed in every call. If If verbose_eval is true, progress is displayed in every call. If
show_progress is an integer, progress will only be displayed every verbose_eval is an integer, progress will only be displayed every
`show_progress` trees, tracked via trial. `verbose_eval` trees, tracked via trial.
""" """
cvmap = {} cvmap = {}
idx = rlist[0].split()[0] idx = rlist[0].split()[0]
@ -341,16 +341,16 @@ def aggcv(rlist, show_stdv=True, show_progress=None, as_pandas=True, trial=0):
import pandas as pd import pandas as pd
results = pd.Series(results, index=index) results = pd.Series(results, index=index)
except ImportError: except ImportError:
if show_progress is None: if verbose_eval is None:
show_progress = True verbose_eval = True
else: else:
# if show_progress is default (None), # if verbose_eval is default (None),
# result will be np.ndarray as it can't hold column name # result will be np.ndarray as it can't hold column name
if show_progress is None: if verbose_eval is None:
show_progress = True verbose_eval = True
if (isinstance(show_progress, int) and show_progress > 0 and trial % show_progress == 0) or \ if (isinstance(verbose_eval, int) and verbose_eval > 0 and trial % verbose_eval == 0) or \
(isinstance(show_progress, bool) and show_progress): (isinstance(verbose_eval, bool) and verbose_eval):
sys.stderr.write(msg + '\n') sys.stderr.write(msg + '\n')
sys.stderr.flush() sys.stderr.flush()
@ -359,7 +359,7 @@ def aggcv(rlist, show_stdv=True, show_progress=None, as_pandas=True, trial=0):
def cv(params, dtrain, num_boost_round=10, nfold=3, stratified=False, folds=None, def cv(params, dtrain, num_boost_round=10, nfold=3, stratified=False, folds=None,
metrics=(), obj=None, feval=None, maximize=False, early_stopping_rounds=None, metrics=(), obj=None, feval=None, maximize=False, early_stopping_rounds=None,
fpreproc=None, as_pandas=True, show_progress=None, show_stdv=True, seed=0): fpreproc=None, as_pandas=True, verbose_eval=None, show_stdv=True, seed=0):
# pylint: disable = invalid-name # pylint: disable = invalid-name
"""Cross-validation with given paramaters. """Cross-validation with given paramaters.
@ -395,11 +395,11 @@ def cv(params, dtrain, num_boost_round=10, nfold=3, stratified=False, folds=None
as_pandas : bool, default True as_pandas : bool, default True
Return pd.DataFrame when pandas is installed. Return pd.DataFrame when pandas is installed.
If False or pandas is not installed, return np.ndarray If False or pandas is not installed, return np.ndarray
show_progress : bool, int, or None, default None verbose_eval : bool, int, or None, default None
Whether to display the progress. If None, progress will be displayed Whether to display the progress. If None, progress will be displayed
when np.ndarray is returned. If True, progress will be displayed at when np.ndarray is returned. If True, progress will be displayed at
boosting stage. If an integer is given, progress will be displayed boosting stage. If an integer is given, progress will be displayed
at every given `show_progress` boosting stage. at every given `verbose_eval` boosting stage.
show_stdv : bool, default True show_stdv : bool, default True
Whether to display the standard deviation in progress. Whether to display the standard deviation in progress.
Results are not affected, and always contains std. Results are not affected, and always contains std.
@ -436,9 +436,9 @@ def cv(params, dtrain, num_boost_round=10, nfold=3, stratified=False, folds=None
if len(metrics) > 1: if len(metrics) > 1:
raise ValueError('Check your params. '\ raise ValueError('Check your params. '\
'Early stopping works with single eval metric only.') 'Early stopping works with single eval metric only.')
if verbose_eval:
sys.stderr.write("Will train until cv error hasn't decreased in {} rounds.\n".format(\ sys.stderr.write("Will train until cv error hasn't decreased in {} rounds.\n".format(\
early_stopping_rounds)) early_stopping_rounds))
maximize_score = False maximize_score = False
if len(metrics) == 1: if len(metrics) == 1:
@ -460,7 +460,7 @@ def cv(params, dtrain, num_boost_round=10, nfold=3, stratified=False, folds=None
for fold in cvfolds: for fold in cvfolds:
fold.update(i, obj) fold.update(i, obj)
res = aggcv([f.eval(i, feval) for f in cvfolds], res = aggcv([f.eval(i, feval) for f in cvfolds],
show_stdv=show_stdv, show_progress=show_progress, show_stdv=show_stdv, verbose_eval=verbose_eval,
as_pandas=as_pandas, trial=i) as_pandas=as_pandas, trial=i)
results.append(res) results.append(res)
@ -472,8 +472,9 @@ def cv(params, dtrain, num_boost_round=10, nfold=3, stratified=False, folds=None
best_score_i = i best_score_i = i
elif i - best_score_i >= early_stopping_rounds: elif i - best_score_i >= early_stopping_rounds:
results = results[:best_score_i+1] results = results[:best_score_i+1]
sys.stderr.write("Stopping. Best iteration:\n[{}] cv-mean:{}\tcv-std:{}\n". if verbose_eval:
format(best_score_i, results[-1][0], results[-1][1])) sys.stderr.write("Stopping. Best iteration:\n[{}] cv-mean:{}\tcv-std:{}\n".
format(best_score_i, results[-1][0], results[-1][1]))
break break
if as_pandas: if as_pandas:
try: try: