|
1 | | -from copy import deepcopy |
| 1 | +import numbers |
| 2 | +import numpy as np |
2 | 3 | import warnings |
3 | 4 | from matplotlib.pylab import LinAlgError |
4 | | -import numpy as np |
5 | | -from sklearn import clone |
| 5 | + |
| 6 | +from scipy.linalg import sqrtm as MatrixSqrt |
| 7 | +from scipy import linalg |
| 8 | +from scipy.linalg import sqrtm as MatrixSqrt |
| 9 | +from scipy.sparse.linalg import svds |
| 10 | + |
6 | 11 | from sklearn.base import check_X_y |
7 | | -from sklearn.calibration import LinearSVC, column_or_1d |
| 12 | +from sklearn.calibration import column_or_1d |
8 | 13 | from sklearn.decomposition._base import _BasePCA |
9 | | -from sklearn.exceptions import NotFittedError |
10 | 14 | from sklearn.linear_model import LogisticRegression, Ridge |
11 | 15 | from sklearn.linear_model._base import LinearModel |
12 | 16 | from sklearn.multioutput import MultiOutputClassifier |
13 | | -from scipy.linalg import sqrtm as MatrixSqrt |
14 | 17 | from sklearn.naive_bayes import LabelBinarizer |
15 | | -from skmatter.utils import check_lr_fit, pcovr_covariance, pcovr_kernel |
16 | | - |
17 | | -import numbers |
18 | | -import warnings |
19 | | - |
20 | | -import numpy as np |
21 | | -from numpy.linalg import LinAlgError |
22 | | -from scipy import linalg |
23 | | -from scipy.linalg import sqrtm as MatrixSqrt |
24 | | -from scipy.sparse.linalg import svds |
25 | | -from sklearn.decomposition._base import _BasePCA |
26 | 18 | from sklearn.decomposition._pca import _infer_dimension |
27 | | -from sklearn.linear_model import LinearRegression, Ridge, RidgeCV |
28 | | -from sklearn.linear_model._base import LinearModel |
29 | 19 | from sklearn.utils import check_array, check_random_state |
30 | 20 | from sklearn.utils._arpack import _init_arpack_v0 |
31 | 21 | from sklearn.utils.extmath import randomized_svd, stable_cumsum, svd_flip |
32 | 22 | from sklearn.utils.validation import check_is_fitted, check_X_y |
33 | 23 |
|
34 | 24 | from skmatter.utils import check_lr_fit, pcovr_covariance, pcovr_kernel |
35 | 25 |
|
36 | | - |
37 | 26 | import sys |
38 | 27 | sys.path.append('scikit-matter') |
39 | 28 | from src.skmatter.utils._pcovc_utils import check_cl_fit |
40 | | -from src.skmatter.decomposition._pcovr import PCovR |
41 | 29 |
|
42 | 30 | class _BasePCov(_BasePCA, LinearModel): |
43 | 31 | def __init__( |
@@ -155,7 +143,6 @@ def fit(self, X, y, W=None): |
155 | 143 |
|
156 | 144 | self.components_ = self.pxt_.T # for sklearn compatibility |
157 | 145 |
|
158 | | - |
159 | 146 | else: |
160 | 147 | # Assign the default classifier |
161 | 148 | if self.classifier != "precomputed": |
|
0 commit comments