diff --git a/doc/modules/classes.rst b/doc/modules/classes.rst index 61b17a5a12ab290ba16c8a80ccb383d9317b5e9b..88088ff6e713fa7c7d62bf2d29d851d0471adacc 100644 --- a/doc/modules/classes.rst +++ b/doc/modules/classes.rst @@ -390,6 +390,8 @@ Signal Decomposition decomposition.fastica decomposition.dict_learning decomposition.dict_learning_online + decomposition.sparse_encode + decomposition.sparse_encode_parallel Linear Discriminant Analysis diff --git a/sklearn/decomposition/__init__.py b/sklearn/decomposition/__init__.py index 748832041db71068999a6b3374e6bdb18593c401..63c0bb1bc3bb59c763a58fea6cfb4cc99cebbc6a 100644 --- a/sklearn/decomposition/__init__.py +++ b/sklearn/decomposition/__init__.py @@ -8,4 +8,5 @@ from .kernel_pca import KernelPCA from .sparse_pca import SparsePCA, MiniBatchSparsePCA from .fastica_ import FastICA, fastica from .dict_learning import dict_learning, dict_learning_online, \ - DictionaryLearning, MiniBatchDictionaryLearning + DictionaryLearning, MiniBatchDictionaryLearning, \ + sparse_encode, sparse_encode_parallel diff --git a/sklearn/decomposition/dict_learning.py b/sklearn/decomposition/dict_learning.py index b8e74087b68daf0741486602856079e21a6ee73f..a4e71dda33cd356d8cdd332bcfa808b9c12423ba 100644 --- a/sklearn/decomposition/dict_learning.py +++ b/sklearn/decomposition/dict_learning.py @@ -80,6 +80,12 @@ def sparse_encode(X, Y, gram=None, cov=None, algorithm='lasso_lars', ------- code: array of shape (n_components, n_features) The sparse codes + + See also + -------- + linear_model.lars_path + linear_model.orthogonal_mp + linear_model.Lasso """ alpha = float(alpha) if alpha is not None else None X, Y = map(np.asanyarray, (X, Y)) @@ -223,6 +229,12 @@ def sparse_encode_parallel(X, Y, gram=None, cov=None, algorithm='lasso_lars', ------- code: array of shape (n_components, n_features) The sparse codes + + See also + -------- + linear_model.lars_path + linear_model.orthogonal_mp + linear_model.Lasso """ n_samples, n_features = Y.shape n_components = X.shape[1]