8000 [MRG] Model selection clean up old files - Reuse as much as possible from the new module(s) by raghavrv · Pull Request #2 · raghavrv/scikit-learn · GitHub
[go: up one dir, main page]
Skip to content

[MRG] Model selection clean up old files - Reuse as much as possible from the new module(s) #2

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

Closed
wants to merge 39 commits into from
Closed

[MRG] Model selection clean up old files - Reuse as much as possible from the new module(s) #2

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
e5f62a2
MAINT Deprecate cross_validation, grid_search and learning_curve modules
raghavrv Jun 4, 2015
98e9c20
ENH introduce the model_selection module
raghavrv Jun 4, 2015
ad4d6fd
TST Add tests for the new model_selection members
raghavrv Jun 6, 2015
ffeb78f
FIX avoid memory cost when sampling from large parameter grids
jnothman Jun 24, 2015
5dbe0c4
FIX/TST pass predefined folds as an iterable
raghavrv Jun 25, 2015
fd71e02
ENH Wrap the old-style cv obj/iterables instead of using iter_cv
raghavrv Jun 25, 2015
89b01e0
Prevent adding *SearchCV estimators from the old grid_search module
raghavrv Jun 28, 2015
51b0dab
ENH Use scipy's binomial coefficient function comb for calucation of nCk
raghavrv Jun 28, 2015
371a7f8
DOC Improve documentation of the cv parameter
raghavrv Jul 1, 2015
44c46a4
COSMIT Use separate lines for each import.
raghavrv Jul 1, 2015
024638a
ENH Few enhancements to the split module
raghavrv Jun 30, 2015
96bcada
TST import one per line; Calculate n_samples from X
raghavrv Jul 2, 2015
3a0c951
TST search import one per line
raghavrv Jul 2, 2015
99479cd
FIX/TST Clean up the split module's tests.
raghavrv Jul 2, 2015
5b9c208
TST Import the old SKF locally
raghavrv Jul 2, 2015
667740f
FIX Use 2D X (1D X is being detected as a single sample)
raghavrv Jul 5, 2015
6ad19a3
MAINT expose BaseCrossValidator
raghavrv Jul 5, 2015
0554582
FIX make PredefinedSplit accept test_folds in constructor; Cleanup do…
raghavrv Jul 6, 2015
8bd7b7a
FIX/DOC Align the 'See also' section of the old KFold, LeaveOneOut
raghavrv Jul 6, 2015
3981466
FIX/DOC Align the 'See also' section of the new KFold, LeaveOneOut
raghavrv Jul 6, 2015
9ec2cc1
FIX all float/invalid type errors at init and int error at split
raghavrv Jul 6, 2015
7bac071
FIX/DOC test_folds --> test_fold
raghavrv Jul 7, 2015
3db4241
FIX/DOC use the higher level model_selection module as ref
raghavrv Jul 26, 2015
d5f05de
ENH p --> n_labels
raghavrv Jul 26, 2015
a0168da
TST/FIX imports on separate lines
raghavrv Aug 2, 2015
8188b0f
DOC/FIX Minor (doc) fixes or typos
raghavrv Aug 2, 2015
1ed5552
FIX use __class__ instead of classmethod
raghavrv Aug 2, 2015
e1efa9b
ENH+TST make rng to be generated at every split call for reproducibility
raghavrv Aug 2, 2015
f17d56e
FIX/MAINT make shuffle public attr in KFold
raghavrv Aug 3, 2015
0c878db
MAINT validate --> validation
raghavrv Aug 3, 2015
81d5964
FIX reuse len_cv instead of recalculating it
raghavrv Aug 3, 2015
c6001d5
TST/FIX import directly from model_selection
raghavrv Aug 9, 2015
a686100
COSMIT Reloacte the random_state documentation
raghavrv Aug 9, 2015
2b157c7
COSMIT remove pass
raghavrv Aug 9, 2015
b6a3b75
FIX Make CVIterableWrapper private.
raghavrv Aug 9, 2015
0660d0f
MAINT Remove deprecation warnings from old tests
raghavrv Aug 10, 2015
02cb8ad
FIX the sorting to use only the 1st item (name)
raghavrv Aug 10, 2015
7bde013
MAINT make the submodules private
raghavrv Aug 10, 2015
46d9883
MAINT Reuse unaltered classes/functions from model_selection
raghavrv Jul 2, 2015
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
Next Next commit
MAINT Deprecate cross_validation, grid_search and learning_curve modules
  • Loading branch information
@raghavrv
raghavrv committed Aug 9, 2015
commit e5f62a2f17e1a35e67e48a2a628a847aa44097d8
8 changes: 8 additions & 0 deletions sklearn/cross_validation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,14 @@
from .metrics.scorer import check_scoring
from .utils.fixes import bincount


warnings.warn("This module has been deprecated in favor of the "
"model_selection module into which all the refactored classes "
"and functions are moved. Also note that the interface of the "
"new CV iterators are different from that of this module. "
"Refer to model_selection for more info.", DeprecationWarning)


__all__ = ['KFold',
'LeaveOneLabelOut',
'LeaveOneOut',
Expand Down
5 changes: 5 additions & 0 deletions sklearn/grid_search.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,11 @@
'ParameterSampler', 'RandomizedSearchCV']


warnings.warn("This module has been deprecated in favor of the "
"model_selection module into which all the refactored classes "
"and functions are moved.", DeprecationWarning)


class ParameterGrid(object):
"""Grid of parameters with a discrete number of values for each.

Expand Down
5 changes: 5 additions & 0 deletions sklearn/learning_curve.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,11 @@
from .utils.fixes import astype


warnings.warn("This module has been deprecated in favor of the "
"model_selection module into which all the functions are moved.",
DeprecationWarning)


__all__ = ['learning_curve', 'validation_curve']


Expand Down
0