8000 Merge branch 'sample-props' of github.com:adrinjalali/scikit-learn in… · scikit-learn/scikit-learn@3098ca0 · GitHub
[go: up one dir, main page]
Skip to content

Commit 3098ca0

Browse files
adrinjalaliadrinjalali
committed
Merge branch 'sample-props' of github.com:adrinjalali/scikit-learn into sample-props
2 parents 0d04e3a + 57fcbc1 commit 3098ca0

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

‎sklearn/preprocessing/_data.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
from scipy import optimize
1919
from scipy.special import boxcox
2020

21-
from ..base import BaseEstimator, TransformerMixin
21+
from ..base import BaseEstimator, TransformerMixin, SampleWeightConsumer
2222
from ..utils import check_array
2323
from ..utils.deprecation import deprecated
2424
from ..utils.extmath import row_norms
@@ -574,7 +574,7 @@ def minmax_scale(X, feature_range=(0, 1), *, axis=0, copy=True):
574574
return X
575575

576576

577-
class StandardScaler(TransformerMixin, BaseEstimator):
577+
class StandardScaler(TransformerMixin, BaseEstimator, SampleWeightConsumer):
578578
"""Standardize features by removing the mean and scaling to unit variance
579579
580580
The standard score of a sample `x` is calculated as:

0 commit comments

Comments
 (0)
0