8000 [MRG+1] Fixes #8198 - error in datasets.make_moons by levy5674 · Pull Request #8199 · scikit-learn/scikit-learn · GitHub
[go: up one dir, main page]
Skip to content

[MRG+1] Fixes #8198 - error in datasets.make_moons #8199

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Jan 17, 2017
Merged

[MRG+1] Fixes #8198 - error in datasets.make_moons #8199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e009847
Fixes #8198 - error in datasets.make_moons
Jan 13, 2017
d4efdb1
Adding test for issue #8198
Jan 14, 2017
a4ef2b7
fixing line too long errors in test_make_moons
Jan 14, 2017
1561675
fixing whitespace in test_make_moons
Jan 14, 2017
e46f2d8
fixing indentation. now passes flake8 on my laptop
Jan 14, 2017
8d981b5
one more whitespace change
Jan 14, 2017
dbaf91b
added bug fix entry for #8198
Jan 16, 2017
bb284ab
in whats_new.rst I had mislabeled a function as a class
Jan 16, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions doc/whats_new.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,10 @@ Enhancements
Bug fixes
.........

- Fixed a bug where :func:`sklearn.datasets.make_moons` gives an
incorrect result when ``n_samples`` is odd.
:issue:`8198` by :user:`Josh Levy <levy5674>`.

- Fixed a bug where :class:`sklearn.linear_model.LassoLars` does not give
the same result as the LassoLars implementation available
in R (lars library). :issue:`7849` by :user:`Jair Montoya Martinez <jmontoyam>`
Expand Down
4 changes: 2 additions & 2 deletions sklearn/datasets/samples_generator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -665,8 +665,8 @@ def make_moons(n_samples=100, shuffle=True, noise=None, random_state=None):

X = np.vstack((np.append(outer_circ_x, inner_circ_x),
np.append(outer_circ_y, inner_circ_y))).T
y = np.hstack([np.zeros(n_samples_in, dtype=np.intp),
np.ones(n_samples_out, dtype=np.intp)])
y = np.hstack([np.zeros(n_samples_out, dtype=np.intp),
np.ones(n_samples_in, dtype=np.intp)])

if shuffle:
X, y = util_shuffle(X, y, random_state=generator)
Expand Down
10 changes: 10 additions & 0 deletions sklearn/datasets/tests/test_samples_generator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
from sklearn.datasets import make_friedman2
from sklearn.datasets import make_friedman3
from sklearn.datasets import make_low_rank_matrix
from sklearn.datasets import make_moons
from sklearn.datasets import make_sparse_coded_signal
from sklearn.datasets import make_sparse_uncorrelated
from sklearn.datasets import make_spd_matrix
Expand Down Expand Up @@ -360,3 +361,12 @@ def test_make_checkerboard():
X2, _, _ = make_checkerboard(shape=(100, 100), n_clusters=2,
shuffle=True, random_state=0)
assert_array_equal(X1, X2)


def test_make_moons():
X, y = make_moons(3, shuffle=False)
for x, label in zip(X, y):
center = [0.0, 0.0] if label == 0 else [1.0, 0.5]
dist_sqr = ((x - center) ** 2).sum()
assert_almost_equal(dist_sqr, 1.0,
err_msg="Point is not on expected unit circle")
0