Thanks to visit codestin.com
Credit goes to github.com

Skip to content

ENH use utility _check_sample_weight in IsotonicRegression #16322

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jan 30, 2020
Merged

ENH use utility _check_sample_weight in IsotonicRegression #16322

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
de68f03
Replaced in-fuction checks with_check_sample_weight for IsotonicRegre…
marijavlajic Jan 25, 2020
2090462
Added import for check_sample_weight.
marijavlajic Jan 25, 2020
6f7391d
Merge remote-tracking branch 'upstream/master' into refact/check-isot…
Batalex Jan 30, 2020
e276179
ENH reorder weights as contiguous array in isotonoic regression
Batalex Jan 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 6 additions & 11 deletions sklearn/isotonic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
from scipy.stats import spearmanr
from .base import BaseEstimator, TransformerMixin, RegressorMixin
from .utils import check_array, check_consistent_length
from .utils.validation import _check_sample_weight
from ._isotonic import _inplace_contiguous_isotonic_regression, _make_unique
import warnings
import math
Expand Down Expand Up @@ -121,10 +122,8 @@ def isotonic_regression(y, sample_weight=None, y_min=None, y_max=None,
order = np.s_[:] if increasing else np.s_[::-1]
y = check_array(y, ensure_2d=False, dtype=[np.float64, np.float32])
y = np.array(y[order], dtype=y.dtype)
if sample_weight is None:
sample_weight = np.ones(len(y), dtype=y.dtype)
else:
sample_weight = np.array(sample_weight[order], dtype=y.dtype)
sample_weight = _check_sample_weight(sample_weight, y, dtype=y.dtype)
sample_weight = np.ascontiguousarray(sample_weight[order])

_inplace_contiguous_isotonic_regression(y, sample_weight)
if y_min is not None or y_max is not None:
Expand Down Expand Up @@ -261,13 +260,9 @@ def _build_y(self, X, y, sample_weight, trim_duplicates=True):

# If sample_weights is passed, removed zero-weight values and clean
# order
if sample_weight is not None:
sample_weight = check_array(sample_weight, ensure_2d=False,
dtype=X.dtype)
mask = sample_weight > 0
X, y, sample_weight = X[mask], y[mask], sample_weight[mask]
else:
sample_weight = np.ones(len(y), dtype=X.dtype)
sample_weight = _check_sample_weight(sample_weight, X, dtype=X.dtype)
mask = sample_weight > 0
X, y, sample_weight = X[mask], y[mask], sample_weight[mask]

order = np.lexsort((y, X))
X, y, sample_weight = [array[order] for array in [X, y, sample_weight]]
Expand Down