Skip to content

Commit 81ae690

Browse files
committed
Working on _BasePCov class and changing docstrings for PCovC
1 parent 5bcc756 commit 81ae690

File tree

4 files changed

+630
-34
lines changed

4 files changed

+630
-34
lines changed

src/skmatter/decomposition/_pcov.py

Lines changed: 9 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,31 @@
1-
from copy import deepcopy
1+
import numbers
2+
import numpy as np
23
import warnings
34
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+
611
from sklearn.base import check_X_y
7-
from sklearn.calibration import LinearSVC, column_or_1d
12+
from sklearn.calibration import column_or_1d
813
from sklearn.decomposition._base import _BasePCA
9-
from sklearn.exceptions import NotFittedError
1014
from sklearn.linear_model import LogisticRegression, Ridge
1115
from sklearn.linear_model._base import LinearModel
1216
from sklearn.multioutput import MultiOutputClassifier
13-
from scipy.linalg import sqrtm as MatrixSqrt
1417
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
2618
from sklearn.decomposition._pca import _infer_dimension
27-
from sklearn.linear_model import LinearRegression, Ridge, RidgeCV
28-
from sklearn.linear_model._base import LinearModel
2919
from sklearn.utils import check_array, check_random_state
3020
from sklearn.utils._arpack import _init_arpack_v0
3121
from sklearn.utils.extmath import randomized_svd, stable_cumsum, svd_flip
3222
from sklearn.utils.validation import check_is_fitted, check_X_y
3323

3424
from skmatter.utils import check_lr_fit, pcovr_covariance, pcovr_kernel
3525

36-
3726
import sys
3827
sys.path.append('scikit-matter')
3928
from src.skmatter.utils._pcovc_utils import check_cl_fit
40-
from src.skmatter.decomposition._pcovr import PCovR
4129

4230
class _BasePCov(_BasePCA, LinearModel):
4331
def __init__(
@@ -155,7 +143,6 @@ def fit(self, X, y, W=None):
155143

156144
self.components_ = self.pxt_.T # for sklearn compatibility
157145

158-
159146
else:
160147
# Assign the default classifier
161148
if self.classifier != "precomputed":

0 commit comments

Comments
 (0)