8000 [MRG] Fix LogisticRegression see also should include LogisticRegressi… · scikit-learn/scikit-learn@2be53f4 · GitHub
[go: up one dir, main page]
Skip to content

Commit 2be53f4

Browse files
srajanpaliwalsrajanpaliwal
committed
[MRG] Fix LogisticRegression see also should include LogisticRegressionCV(#9995)
 - Added reference to LogisticRegressionCV in LogisticRegression. - Added reference to OrthogonalMatchingPursuitCV in OrthogonalMatchingPursuit. - Added references for ElasticNetCV, MultiTaskElasticNet, MultiTaskLasso. - Cross-referenced RFE and RFECV in each others docstring. - Cross-referenced CalibratedClassifierCV in _CalibrationClassifier - Added reference to LassoLarsIC in docstring of LassoLars. - Added description to references in See also section of Ridge, RidgeClassifier.
1 parent e41c4d5 commit 2be53f4

File tree

7 files changed

+37
-11
lines changed

7 files changed

+37
-11
lines changed

‎sklearn/calibration.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -265,6 +265,10 @@ class _CalibratedClassifier(object):
265265
if None, then classes is extracted from the given target values
266266
in fit().
267267
268+
See also
269+
--------
270+
CalibratedClassifierCV
271+
268272
References
269273
----------
270274
.. [1] Obtaining calibrated probability estimates from decision trees

‎sklearn/feature_selection/rfe.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,11 @@ class RFE(BaseEstimator, MetaEstimatorMixin, SelectorMixin):
101101
>>> selector.ranking_
102102
array([1, 1, 1, 1, 1, 6, 4, 3, 2, 5])
103103
104+
See also
105+
--------
106+
RFECV : Recursive feature elimination with built-in cross-validated
107+
selection of the best number of features
108+
104109
References
105110
----------
106111
@@ -365,6 +370,10 @@ class RFECV(RFE, MetaEstimatorMixin):
365370
>>> selector.ranking_
366371
array([1, 1, 1, 1, 1, 6, 4, 3, 2, 5])
367372
373+
See also
374+
--------
375+
RFE : Recursive feature elimination
376+
368377
References
369378
----------
370379

‎sklearn/linear_model/coordinate_descent.py

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -640,6 +640,8 @@ class ElasticNet(LinearModel, RegressorMixin):
640640
641641
See also
642642
--------
643+
ElasticNetCV : Elastic net model with best model selection by
644+
cross-validation.
643645
SGDRegressor: implements elastic net regression with incremental training.
644646
SGDClassifier: implements logistic regression with elastic net penalty
645647
(``SGDClassifier(loss="log", penalty="elasticnet")``).
@@ -1688,7 +1690,10 @@ class MultiTaskElasticNet(Lasso):
16881690
16891691
See also
16901692
--------
1691-
ElasticNet, MultiTaskLasso
1693+
MultiTaskElasticNet : Multi-task L1/L2 ElasticNet with built-in
1694+
cross-validation.
1695+
ElasticNet
1696+
MultiTaskLasso
16921697
16931698
Notes
16941699
-----
@@ -1873,7 +1878,9 @@ class MultiTaskLasso(MultiTaskElasticNet):
18731878
18741879
See also
18751880
--------
1876-
Lasso, MultiTaskElasticNet
1881+
MultiTaskLasso : Multi-task L1/L2 Lasso with built-in cross-validation
1882+
Lasso
1883+
MultiTaskElasticNet
18771884
18781885
Notes
18791886
-----

‎sklearn/linear_model/least_angle.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -824,6 +824,7 @@ class LassoLars(Lars):
824824
Lasso
825825
LassoCV
826826
LassoLarsCV
827+
LassoLarsIC
827828
sklearn.decomposition.sparse_encode
828829
829830
"""

‎sklearn/linear_model/logistic.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1120,6 +1120,7 @@ class LogisticRegression(BaseEstimator, LinearClassifierMixin,
11201120
SGDClassifier : incrementally trained logistic regression (when given
11211121
the parameter ``loss="log"``).
11221122
sklearn.svm.LinearSVC : learns SVM models using the same algorithm.
1123+
LogisticRegressionCV : Logistic regression with built-in cross validation
11231124
11241125
Notes
11251126
-----

‎sklearn/linear_model/omp.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -598,7 +598,7 @@ class OrthogonalMatchingPursuit(LinearModel, RegressorMixin):
598598
Lars
599599
LassoLars
600600
decomposition.sparse_encode
601-
601+
OrthogonalMatchingPursuitCV
602602
"""
603603
def __init__(self, n_nonzero_coefs=None, tol=None, fit_intercept=True,
604604
normalize=True, precompute='auto'):

‎sklearn/linear_model/ridge.py

Lines changed: 12 additions & 8 deletions
8000
Original file line numberDiff line numberDiff line change
@@ -624,7 +624,10 @@ class Ridge(_BaseRidge, RegressorMixin):
624624
625625
See also
626626
--------
627-
RidgeClassifier, RidgeCV, :class:`sklearn.kernel_ridge.KernelRidge`
627+
RidgeClassifier : Ridge classifier
628+
RidgeCV : Ridge regression with built-in cross validation
629+
:class:`sklearn.kernel_ridge.KernelRidge` : Kernel ridge regression
630+
combines ridge regression with the kernel trick
628631
629632
Examples
630633
--------
@@ -770,7 +773,8 @@ class RidgeClassifier(LinearClassifierMixin, _BaseRidge):
770773
771774
See also
772775
--------
773-
Ridge, RidgeClassifierCV
776+
Ridge : Ridge regression
777+
RidgeClassifierCV : Ridge classifier with built-in cross validation
774778
775779
Notes
776780
-----
@@ -1233,9 +1237,9 @@ class RidgeCV(_BaseRidgeCV, RegressorMixin):
12331237
12341238
See also
12351239
--------
1236-
Ridge: Ridge regression
1237-
RidgeClassifier: Ridge classifier
1238-
RidgeClassifierCV: Ridge classifier with built-in cross validation
1240+
Ridge : Ridge regression
1241+
RidgeClassifier : Ridge classifier
1242+
RidgeClassifierCV : Ridge classifier with built-in cross validation
12391243
"""
12401244
pass
12411245

@@ -1318,9 +1322,9 @@ class RidgeClassifierCV(LinearClassifierMixin, _BaseRidgeCV):
13181322
13191323
See also
13201324
--------
1321-
Ridge: Ridge regression
1322-
RidgeClassifier: Ridge classifier
1323-
RidgeCV: Ridge regression with built-in cross validation
1325+
Ridge : Ridge regression
1326+
RidgeClassifier : Ridge classifier
1327+
RidgeCV : Ridge regression with built-in cross validation
13241328
13251329
Notes
13261330
-----

0 commit comments

Comments
 (0)
0