Fix #3648: XGBClassifier.predict() should return margin scores when output_margin=True (#3651)

* Fix #3648: XGBClassifier.predict() should return margin scores when output_margin=True

* Fix tests to reflect correct implementation of XGBClassifier.predict(output_margin=True)

* Fix flaky test test_with_sklearn.test_sklearn_api_gblinear
This commit is contained in:
Philip Hyunsu Cho
2018-08-30 21:05:05 -07:00
committed by GitHub
parent 5b662cbe1c
commit 86d88c0758
2 changed files with 16 additions and 8 deletions

View File

@@ -652,6 +652,10 @@ class XGBClassifier(XGBModel, XGBClassifierBase):
output_margin=output_margin,
ntree_limit=ntree_limit,
validate_features=validate_features)
if output_margin:
# If output_margin is active, simply return the scores
return class_probs
if len(class_probs.shape) > 1:
column_indexes = np.argmax(class_probs, axis=1)
else: