From 41e0e84e622215f7bb11382b1fefa624cac2dd4d Mon Sep 17 00:00:00 2001 From: Alberto Ceballos Date: Sat, 23 Oct 2021 12:39:43 -0400 Subject: [PATCH 1/5] Added description for the default=None case of the n_components parameter in MiniBatchSparsePCA. --- sklearn/decomposition/_sparse_pca.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sklearn/decomposition/_sparse_pca.py b/sklearn/decomposition/_sparse_pca.py index 37ef6b556bd25..d5b5dda748dfe 100644 --- a/sklearn/decomposition/_sparse_pca.py +++ b/sklearn/decomposition/_sparse_pca.py @@ -248,7 +248,8 @@ class MiniBatchSparsePCA(SparsePCA): Parameters ---------- n_components : int, default=None - Number of sparse atoms to extract. + Number of sparse atoms to extract. If None, then ``n_components`` + is set to ``n_features_in_``. alpha : int, default=1 Sparsity controlling parameter. Higher values lead to sparser From 3eddba1c0d14b4d812696aa400fd41afabe993fb Mon Sep 17 00:00:00 2001 From: Alberto Ceballos Date: Sat, 23 Oct 2021 12:58:48 -0400 Subject: [PATCH 2/5] Add the description for the n_components=None case to MiniBatchDictionaryLearning class and dict_learning_online function. --- sklearn/decomposition/_dict_learning.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sklearn/decomposition/_dict_learning.py b/sklearn/decomposition/_dict_learning.py index a18adb6f1e3bc..d4abf7969fc69 100644 --- a/sklearn/decomposition/_dict_learning.py +++ b/sklearn/decomposition/_dict_learning.py @@ -763,7 +763,8 @@ def dict_learning_online( Data matrix. n_components : int, default=2 - Number of dictionary atoms to extract. + Number of dictionary atoms to extract. If None, then ``n_components`` + is set to ``n_features``. alpha : float, default=1 Sparsity controlling parameter. @@ -1336,7 +1337,8 @@ class DictionaryLearning(_BaseSparseCoding, BaseEstimator): Parameters ---------- n_components : int, default=n_features - Number of dictionary elements to extract. + Number of dictionary elements to extract. If None, then ``n_components`` + is set to ``n_features_in_``. alpha : float, default=1.0 Sparsity controlling parameter. From 5c12d98f8813d92213e2ab83985f597e859b6503 Mon Sep 17 00:00:00 2001 From: Alberto Mario Ceballos-Arroyo Date: Sat, 23 Oct 2021 14:08:32 -0400 Subject: [PATCH 3/5] Setting the reference to the number of features back to ``n_features`` as per @amueller. --- sklearn/decomposition/_dict_learning.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sklearn/decomposition/_dict_learning.py b/sklearn/decomposition/_dict_learning.py index d4abf7969fc69..3a3ddac142a13 100644 --- a/sklearn/decomposition/_dict_learning.py +++ b/sklearn/decomposition/_dict_learning.py @@ -1338,7 +1338,7 @@ class DictionaryLearning(_BaseSparseCoding, BaseEstimator): ---------- n_components : int, default=n_features Number of dictionary elements to extract. If None, then ``n_components`` - is set to ``n_features_in_``. + is set to ``n_features``. alpha : float, default=1.0 Sparsity controlling parameter. From a4a72f6c0a6184eabfc58c959e44c94f3d4b60bf Mon Sep 17 00:00:00 2001 From: Alberto Mario Ceballos-Arroyo Date: Sat, 23 Oct 2021 14:10:18 -0400 Subject: [PATCH 4/5] Update _sparse_pca.py Updated references to the number of features to be ``n_features``. --- sklearn/decomposition/_sparse_pca.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sklearn/decomposition/_sparse_pca.py b/sklearn/decomposition/_sparse_pca.py index 17a105f5b835d..1d7b4d6dfc063 100644 --- a/sklearn/decomposition/_sparse_pca.py +++ b/sklearn/decomposition/_sparse_pca.py @@ -24,7 +24,7 @@ class SparsePCA(TransformerMixin, BaseEstimator): ---------- n_components : int, default=None Number of sparse atoms to extract. If None, then ``n_components`` - is set to ``n_features_in_``. + is set to ``n_features``. alpha : float, default=1 Sparsity controlling parameter. Higher values lead to sparser @@ -250,7 +250,7 @@ class MiniBatchSparsePCA(SparsePCA): ---------- n_components : int, default=None Number of sparse atoms to extract. If None, then ``n_components`` - is set to ``n_features_in_``. + is set to ``n_features``. alpha : int, default=1 Sparsity controlling parameter. Higher values lead to sparser From ffa9e91d59b73882f565dc44f6c0a9f5a949b492 Mon Sep 17 00:00:00 2001 From: Alberto Mario Ceballos-Arroyo Date: Mon, 25 Oct 2021 10:41:30 -0400 Subject: [PATCH 5/5] Create _dict_learning.py Minor changes for consistency in n_components default value and its dtype. --- sklearn/decomposition/_dict_learning.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sklearn/decomposition/_dict_learning.py b/sklearn/decomposition/_dict_learning.py index 3a3ddac142a13..3ade7727a8b7e 100644 --- a/sklearn/decomposition/_dict_learning.py +++ b/sklearn/decomposition/_dict_learning.py @@ -762,7 +762,7 @@ def dict_learning_online( X : ndarray of shape (n_samples, n_features) Data matrix. - n_components : int, default=2 + n_components : int or None, default=2 Number of dictionary atoms to extract. If None, then ``n_components`` is set to ``n_features``. @@ -1336,7 +1336,7 @@ class DictionaryLearning(_BaseSparseCoding, BaseEstimator): Parameters ---------- - n_components : int, default=n_features + n_components : int, default=None Number of dictionary elements to extract. If None, then ``n_components`` is set to ``n_features``.