From af0ef6f45b34d099874bf42ba98f14f2439af06c Mon Sep 17 00:00:00 2001 From: Chiara Marmo Date: Thu, 7 Nov 2019 13:25:10 +0100 Subject: [PATCH] Fix some new sphinx warnings. --- doc/modules/compose.rst | 26 +++++++++++++------------- doc/whats_new/v0.22.rst | 5 ++--- sklearn/mixture/_bayesian_mixture.py | 4 ++-- 3 files changed, 17 insertions(+), 18 deletions(-) diff --git a/doc/modules/compose.rst b/doc/modules/compose.rst index 5a41a14154b1e..8145cdef984bb 100644 --- a/doc/modules/compose.rst +++ b/doc/modules/compose.rst @@ -467,19 +467,19 @@ with a :func:`~sklearn.compose.make_column_selector`. The :func:`~sklearn.compose.make_column_selector` is used to select columns based on data type or column name:: ->>> from sklearn.preprocessing import StandardScaler ->>> from sklearn.compose import make_column_selector ->>> ct = ColumnTransformer([ -... ('scale', StandardScaler(), -... make_column_selector(dtype_include=np.number)), -... ('onehot', -... OneHotEncoder(), -... make_column_selector(pattern='city', dtype_include=object))]) ->>> ct.fit_transform(X) -array([[ 0.904..., 0. , 1. , 0. , 0. ], - [-1.507..., 1.414..., 1. , 0. , 0. ], - [-0.301..., 0. , 0. , 1. , 0. ], - [ 0.904..., -1.414..., 0. , 0. , 1. ]]) + >>> from sklearn.preprocessing import StandardScaler + >>> from sklearn.compose import make_column_selector + >>> ct = ColumnTransformer([ + ... ('scale', StandardScaler(), + ... make_column_selector(dtype_include=np.number)), + ... ('onehot', + ... OneHotEncoder(), + ... make_column_selector(pattern='city', dtype_include=object))]) + >>> ct.fit_transform(X) + array([[ 0.904..., 0. , 1. , 0. , 0. ], + [-1.507..., 1.414..., 1. , 0. , 0. ], + [-0.301..., 0. , 0. , 1. , 0. ], + [ 0.904..., -1.414..., 0. , 0. , 1. ]]) Strings can reference columns if the input is a DataFrame, integers are always interpreted as the positional columns. diff --git a/doc/whats_new/v0.22.rst b/doc/whats_new/v0.22.rst index 525ae77311064..dc3afeb4ed96f 100644 --- a/doc/whats_new/v0.22.rst +++ b/doc/whats_new/v0.22.rst @@ -157,13 +157,12 @@ Changelog `affinity='cosine'` and `X` has samples that are all-zeros. :pr:`7943` by :user:`mthorrell`. - :mod:`sklearn.compose` ...................... - |Feature| Adds :func:`compose.make_column_selector` which is used with :class:`compose.ColumnTransformer` to select DataFrame columns on the basis - of name and dtype. :pr:`12303` by `Thomas Fan `_. + of name and dtype. :pr:`12303` by `Thomas Fan`_. - |Fix| Fixed a bug in :class:`compose.ColumnTransformer` which failed to select the proper columns when using a boolean list, with NumPy older than @@ -907,4 +906,4 @@ These changes mostly affect library developers. - |Fix| The estimators tags resolution now follows the regular MRO. They used to be overridable only once. :pr:`14884` by :user:`Andreas Müller - `. \ No newline at end of file + `. diff --git a/sklearn/mixture/_bayesian_mixture.py b/sklearn/mixture/_bayesian_mixture.py index 4438387e055fd..cecbb0f36a201 100644 --- a/sklearn/mixture/_bayesian_mixture.py +++ b/sklearn/mixture/_bayesian_mixture.py @@ -261,8 +261,8 @@ class BayesianGaussianMixture(BaseMixture): The precision prior on the mean distribution (Gaussian). Controls the extent of where means can be placed. Larger values concentrate the cluster means around `mean_prior`. - If mean_precision_prior is set to None, mean_precision_prior_ is set to - 1. + If mean_precision_prior is set to None, `mean_precision_prior_` is set + to 1. mean_precision_ : array-like, shape (n_components,) The precision of each components on the mean distribution (Gaussian).