8000 API : move isotonic regression out of linear_model · erg/scikit-learn@23ac37a · GitHub
[go: up one dir, main page]
Skip to content

Commit 23ac37a

Browse files
agramfortagramfort
committed
API : move isotonic regression out of linear_model
1 parent e481596 commit 23ac37a

File tree

6 files changed

+7
-8
lines changed

6 files changed

+7
-8
lines changed

‎sklearn/__init__.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,8 @@ def test(self, label='fast', verbose=1, extra_argv=['--exe'],
6767
'feature_selection', 'semi_supervised',
6868
'gaussian_process', 'grid_search', 'hmm', 'lda', 'linear_model',
6969
'metrics', 'mixture', 'naive_bayes', 'neighbors', 'pipeline',
70-
'preprocessing', 'qda', 'svm', 'test', 'clone', 'pls']
70+
'preprocessing', 'qda', 'svm', 'test', 'clone', 'pls',
71+
'isotonic']
7172

7273

7374
def setup_module(module):

‎sklearn/linear_model/isotonic_regression_.py‎ renamed to ‎sklearn/isotonic.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
import numpy as np
77
from scipy import interpolate
8-
from ..base import BaseEstimator, TransformerMixin, RegressorMixin
9-
from ..utils import as_float_array, check_arrays
8+
from .base import BaseEstimator, TransformerMixin, RegressorMixin
9+
from .utils import as_float_array, check_arrays
1010

1111

1212
def isotonic_regression(y, weight=None, y_min=None, y_max=None):

‎sklearn/linear_model/__init__.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
from .perceptron import Perceptron
2929
from .randomized_l1 import RandomizedLasso, RandomizedLogisticRegression, \
3030
lasso_stability_path
31-
from .isotonic_regression_ import IsotonicRegression, isotonic_regression
3231

3332
__all__ = ['ARDRegression',
3433
'BayesianRidge',

‎sklearn/manifold/mds.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
from ..utils import check_random_state, check_arrays
1515
from ..externals.joblib import Parallel
1616
from ..externals.joblib import delayed
17-
from ..linear_model.isotonic_regression_ import isotonic_regression
17+
from ..isotonic import isotonic_regression
1818

1919

2020
def _smacof_single(similarities, metric=True, n_components=2, init=None,

‎sklearn/tests/test_common.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
Normalizer, OneHotEncoder
5151
from sklearn.cluster import WardAgglomeration, AffinityPropagation, \
5252
SpectralClustering
53-
from sklearn.linear_model import IsotonicRegression
53+
from sklearn.isotonic import IsotonicRegression
5454

5555
dont_test = [Pipeline, FeatureUnion, GridSearchCV, SparseCoder,
5656
EllipticEnvelope, EllipticEnvelop, DictVectorizer, LabelBinarizer,

‎sklearn/linear_model/tests/test_isotonic_regression.py‎ renamed to ‎sklearn/tests/test_isotonic.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import numpy as np
22

3-
from sklearn.linear_model.isotonic_regression_ import isotonic_regression
4-
from sklearn.linear_model import IsotonicRegression
3+
from sklearn.isotonic import isotonic_regression, IsotonicRegression
54

65
from sklearn.utils.testing import assert_raises
76
from sklearn.utils.testing import assert_array_equal

0 commit comments

Comments
 (0)
0