8000 [MRG+1] New text for the ValueError that is thrown by _check_param_grid method by b0noI · Pull Request #7216 · scikit-learn/scikit-learn · GitHub
[go: up one dir, main page]
Skip to content

[MRG+1] New text for the ValueError that is thrown by _check_param_grid method #7216

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 9 commits into from
Aug 31, 2016
Merged

[MRG+1] New text for the ValueError that is thrown by _check_param_grid method #7216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6e1418e
ValueError that is thrown by _check_param_grid method now includes pa…
b0noI Aug 20, 2016
214a482
ValueError that is thrown by _check_param_grid method now includes pa…
b0noI Aug 20, 2016
fa6b88c
Merge branch 'master' of https://github.com/b0noI/scikit-learn
b0noI Aug 20, 2016
f7f1b96
"values" has been changed ot the "value" in the ValueError message.
b0noI Aug 23, 2016
5e9e941
Text of the ValueError in _check_param_grid has been changed.
b0noI Aug 24, 2016
0585462
Tests that are checking that _grid_search method throws correct Value…
b0noI Aug 28, 2016
401d2a1
Test method test_grid_search_incorrect_param_grid has been renamed to…
b0noI Aug 28, 2016
47eae84 MockClassifier has been added to the _grid_search tests.
b0noI Aug 30, 2016
f906b9f
Lines over 81 chracter length got reformatted.
b0noI Aug 31, 2016
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
9 changes: 5 additions & 4 deletions sklearn/grid_search.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,17 +326,18 @@ def _check_param_grid(param_grid):
param_grid = [param_grid]

for p in param_grid:
for v in p.values():
for name, v in p.items():
if isinstance(v, np.ndarray) and v.ndim > 1:
raise ValueError("Parameter array should be one-dimensional.")

check = [isinstance(v, k) for k in (list, tuple, np.ndarray)]
if True not in check:
raise ValueError("Parameter values should be a list.")
raise ValueError("Parameter values for parameter ({0}) need "
"to be a sequence.".format(name))

if len(v) == 0:
raise ValueError("Parameter values should be a non-empty "
"list.")
raise ValueError("Parameter values for parameter ({0}) need "
"to be a non-empty sequence.".format(name))


class _CVScoreTuple (namedtuple('_CVScoreTuple',
Expand Down
9 changes: 5 additions & 4 deletions sklearn/model_selection/_search.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,17 +327,18 @@ def _check_param_grid(param_grid):
param_grid = [param_grid]

for p in param_grid:
for v in p.values():
for name, v in p.items():
if isinstance(v, np.ndarray) and v.ndim > 1:
raise ValueError("Parameter array should be one-dimensional.")

check = [isinstance(v, k) for k in (list, tuple, np.ndarray)]
if True not in check:
raise ValueError("Parameter values should be a list.")
raise ValueError("Parameter values for parameter ({0}) need "
"to be a sequence.".format(name))

if len(v) == 0:
raise ValueError("Parameter values should be a non-empty "
"list.")
raise ValueError("Parameter values for parameter ({0}) need "
"to be a non-empty sequence.".format(name))


# XXX Remove in 0.20
Expand Down
16 changes: 16 additions & 0 deletions sklearn/model_selection/tests/test_search.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,22 @@ def test_grid_search():
assert_raises(ValueError, grid_search.fit, X, y)


def test_grid_search_incorrect_param_grid():
clf = MockClassifier()
assert_raise_message(
ValueError,
"Parameter values for parameter (C) need to be a sequence.",
GridSearchCV, clf, {'C': 1})


def test_grid_search_param_grid_includes_sequence_of_a_zero_length():
clf = MockClassifier()
assert_raise_message(
ValueError,
"Parameter values for parameter (C) need to be a non-empty sequence.",
GridSearchCV, clf, {'C': []})


@ignore_warnings
def test_grid_search_no_score():
# Test grid-search on classifier that has no score function.
Expand Down
0