From 9a794df0cba4d92876d694e63f45a89ca1831f57 Mon Sep 17 00:00:00 2001 From: Thalia Barrera Date: Sat, 29 Sep 2018 13:08:15 -0400 Subject: [PATCH 1/8] Added example to sklearn.decomposition.DictionaryLearning --- sklearn/decomposition/dict_learning.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/sklearn/decomposition/dict_learning.py b/sklearn/decomposition/dict_learning.py index d050949f131fe..3222fa615c7d6 100644 --- a/sklearn/decomposition/dict_learning.py +++ b/sklearn/decomposition/dict_learning.py @@ -717,6 +717,21 @@ def dict_learning_online(X, n_components=2, alpha=1, n_iter=100, Number of iterations run. Returned only if `return_n_iter` is set to `True`. + Examples + -------- + >>> import numpy as np + >>> from sklearn.decomposition import DictionaryLearning + >>> X = np.array([[0., 0., 1.], + ... [1.,0.,0.], + ... [2.,2.,2.], + ... [2.,5.,4.]]) + >>> pdico = DictionaryLearning(n_components=3, alpha=1) + >>> V = dico.fit(X).components_ + >>> V + array([[-0.2981424 , -0.74535599, -0.59628479], + [ 0.57735027, 0.57735027, 0.57735027], + [ 0.29188578, 0.47004059, 0.83298531]]) + See also -------- dict_learning From 8827a2492ceebaa8d60290210bbe09c7d662a7cd Mon Sep 17 00:00:00 2001 From: Thalia Barrera Date: Sat, 29 Sep 2018 13:30:06 -0400 Subject: [PATCH 2/8] Added example to sklearn.decomposition.DictionaryLearning --- 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 3222fa615c7d6..1f83a9d063b14 100644 --- a/sklearn/decomposition/dict_learning.py +++ b/sklearn/decomposition/dict_learning.py @@ -725,12 +725,12 @@ def dict_learning_online(X, n_components=2, alpha=1, n_iter=100, ... [1.,0.,0.], ... [2.,2.,2.], ... [2.,5.,4.]]) - >>> pdico = DictionaryLearning(n_components=3, alpha=1) + >>> dico = DictionaryLearning(n_components=3, alpha=1, random_state=1) >>> V = dico.fit(X).components_ >>> V array([[-0.2981424 , -0.74535599, -0.59628479], [ 0.57735027, 0.57735027, 0.57735027], - [ 0.29188578, 0.47004059, 0.83298531]]) + [ 0.03387612, 0.46770346, -0.88323603]]) See also -------- From 1d3211b7ebe6e25bffc13e9cdb42bed1ce899c4a Mon Sep 17 00:00:00 2001 From: Thalia Barrera Date: Sat, 29 Sep 2018 13:44:58 -0400 Subject: [PATCH 3/8] corrected n_components for example to sklearn.decomposition.DictionaryLearning --- 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 1f83a9d063b14..69fcd1d387457 100644 --- a/sklearn/decomposition/dict_learning.py +++ b/sklearn/decomposition/dict_learning.py @@ -725,7 +725,7 @@ def dict_learning_online(X, n_components=2, alpha=1, n_iter=100, ... [1.,0.,0.], ... [2.,2.,2.], ... [2.,5.,4.]]) - >>> dico = DictionaryLearning(n_components=3, alpha=1, random_state=1) + >>> dico = DictionaryLearning(n_components=2, alpha=1, random_state=1) >>> V = dico.fit(X).components_ >>> V array([[-0.2981424 , -0.74535599, -0.59628479], From 9b413eb9a795ff86b4e26b7c76811a6348620d7c Mon Sep 17 00:00:00 2001 From: Thalia Barrera Date: Sat, 29 Sep 2018 13:46:23 -0400 Subject: [PATCH 4/8] corrected n_components and output for example to sklearn.decomposition.DictionaryLearning --- sklearn/decomposition/dict_learning.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sklearn/decomposition/dict_learning.py b/sklearn/decomposition/dict_learning.py index 69fcd1d387457..fac00b76ca22c 100644 --- a/sklearn/decomposition/dict_learning.py +++ b/sklearn/decomposition/dict_learning.py @@ -729,8 +729,7 @@ def dict_learning_online(X, n_components=2, alpha=1, n_iter=100, >>> V = dico.fit(X).components_ >>> V array([[-0.2981424 , -0.74535599, -0.59628479], - [ 0.57735027, 0.57735027, 0.57735027], - [ 0.03387612, 0.46770346, -0.88323603]]) + [ 0.57735027, 0.57735027, 0.57735027]]) See also -------- From 1e807e283d980aa6345ee0f1d5f07a8a1a506b0c Mon Sep 17 00:00:00 2001 From: reshamas Date: Sun, 16 Dec 2018 22:20:14 -0500 Subject: [PATCH 5/8] indented matrix lines, formatted long decimal --- sklearn/decomposition/dict_learning.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/sklearn/decomposition/dict_learning.py b/sklearn/decomposition/dict_learning.py index fac00b76ca22c..8e519a3e17dfa 100644 --- a/sklearn/decomposition/dict_learning.py +++ b/sklearn/decomposition/dict_learning.py @@ -722,14 +722,13 @@ def dict_learning_online(X, n_components=2, alpha=1, n_iter=100, >>> import numpy as np >>> from sklearn.decomposition import DictionaryLearning >>> X = np.array([[0., 0., 1.], - ... [1.,0.,0.], - ... [2.,2.,2.], - ... [2.,5.,4.]]) + ... [1.,0.,0.], + ... [2.,2.,2.], + ... [2.,5.,4.]]) >>> dico = DictionaryLearning(n_components=2, alpha=1, random_state=1) - >>> V = dico.fit(X).components_ - >>> V - array([[-0.2981424 , -0.74535599, -0.59628479], - [ 0.57735027, 0.57735027, 0.57735027]]) + >>> dico.fit(X).components_ + array([[-0.2981... , -0.7453..., -0.5962...], + [ 0.5773..., 0.5773..., 0.5773...]]) See also -------- From 2925d7588f2f409a09e7b79fa24846d681e727f1 Mon Sep 17 00:00:00 2001 From: reshamas Date: Sun, 16 Dec 2018 22:33:13 -0500 Subject: [PATCH 6/8] fixed formatting of matrix items --- sklearn/decomposition/dict_learning.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sklearn/decomposition/dict_learning.py b/sklearn/decomposition/dict_learning.py index 8e519a3e17dfa..8dfebd6edf53d 100644 --- a/sklearn/decomposition/dict_learning.py +++ b/sklearn/decomposition/dict_learning.py @@ -722,12 +722,12 @@ def dict_learning_online(X, n_components=2, alpha=1, n_iter=100, >>> import numpy as np >>> from sklearn.decomposition import DictionaryLearning >>> X = np.array([[0., 0., 1.], - ... [1.,0.,0.], - ... [2.,2.,2.], - ... [2.,5.,4.]]) + ... [1., 0., 0.], + ... [2., 2., 2.], + ... [2., 5., 4.]]) >>> dico = DictionaryLearning(n_components=2, alpha=1, random_state=1) >>> dico.fit(X).components_ - array([[-0.2981... , -0.7453..., -0.5962...], + array([[-0.2981..., -0.7453..., -0.5962...], [ 0.5773..., 0.5773..., 0.5773...]]) See also From c3fff1b3264eb8bf6641230d19356399e75fe455 Mon Sep 17 00:00:00 2001 From: reshamas Date: Mon, 17 Dec 2018 10:06:54 -0500 Subject: [PATCH 7/8] added '# doctest: +ELLIPSIS' to example --- 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 8f7c466f8fa75..1b379f1256c02 100644 --- a/sklearn/decomposition/dict_learning.py +++ b/sklearn/decomposition/dict_learning.py @@ -726,7 +726,7 @@ def dict_learning_online(X, n_components=2, alpha=1, n_iter=100, ... [2., 2., 2.], ... [2., 5., 4.]]) >>> dico = DictionaryLearning(n_components=2, alpha=1, random_state=1) - >>> dico.fit(X).components_ + >>> dico.fit(X).components_ # doctest: +ELLIPSIS array([[-0.2981..., -0.7453..., -0.5962...], [ 0.5773..., 0.5773..., 0.5773...]]) From 9ddf6fb83cfcdfde3574226ad67e24287dc138f6 Mon Sep 17 00:00:00 2001 From: reshamas Date: Mon, 17 Dec 2018 22:35:30 -0500 Subject: [PATCH 8/8] added 2 spaces before comment on doctest --- 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 1b379f1256c02..844d295ecc8de 100644 --- a/sklearn/decomposition/dict_learning.py +++ b/sklearn/decomposition/dict_learning.py @@ -726,7 +726,7 @@ def dict_learning_online(X, n_components=2, alpha=1, n_iter=100, ... [2., 2., 2.], ... [2., 5., 4.]]) >>> dico = DictionaryLearning(n_components=2, alpha=1, random_state=1) - >>> dico.fit(X).components_ # doctest: +ELLIPSIS + >>> dico.fit(X).components_ # doctest: +ELLIPSIS array([[-0.2981..., -0.7453..., -0.5962...], [ 0.5773..., 0.5773..., 0.5773...]])