Commit Graph

85 Commits

Author SHA1 Message Date
seales 0485ada58b General spelling fixes 2015-12-16 09:46:42 -08:00
Raghav R V 3f8743f47b Main Commits - Major
--------------------

* ENH Reogranize classes/fn from grid_search into search.py
* ENH Reogranize classes/fn from cross_validation into split.py
* ENH Reogranize cls/fn from cross_validation/learning_curve into validate.py

* MAINT Merge _check_cv into check_cv inside the model_selection module
* MAINT Update all the imports to point to the model_selection module
* FIX use iter_cv to iterate throught the new style/old style cv objs
* TST Add tests for the new model_selection members
* ENH Wrap the old-style cv obj/iterables instead of using iter_cv

* ENH Use scipy's binomial coefficient function comb for calucation of nCk
* ENH Few enhancements to the split module
* ENH Improve check_cv input validation and docstring
* MAINT _get_test_folds(X, y, labels) --> _get_test_folds(labels)
* TST if 1d arrays for X introduce any errors
* ENH use 1d X arrays for all tests;
* ENH X_10 --> X (global var)

Minor
-----

* ENH _PartitionIterator --> _BaseCrossValidator;
* ENH CVIterator --> CVIterableWrapper
* TST Import the old SKF locally
* FIX/TST Clean up the split module's tests.
* DOC Improve documentation of the cv parameter
* COSMIT consistently hyphenate cross-validation/cross-validator
* TST Calculate n_samples from X
* COSMIT Use separate lines for each import.
* COSMIT cross_validation_generator --> cross_validator

Commits merged manually
-----------------------

* FIX Document the random_state attribute in RandomSearchCV
* MAINT Use check_cv instead of _check_cv
* ENH refactor OVO decision function, use it in SVC for sklearn-like
  decision_function shape
* FIX avoid memory cost when sampling from large parameter grids

ENH Major to Minor incremental enhancements to the model_selection

Squashed commit messages - (For reference)

Major
-----

* ENH p --> n_labels
* FIX *ShuffleSplit: all float/invalid type errors at init and int error at split
* FIX make PredefinedSplit accept test_folds in constructor; Cleanup docstrings
* ENH+TST KFold: make rng to be generated at every split call for reproducibility
* FIX/MAINT KFold: make shuffle a public attr
* FIX Make CVIterableWrapper private.
* FIX reuse len_cv instead of recalculating it
* FIX Prevent adding *SearchCV estimators from the old grid_search module
* re-FIX In all_estimators: the sorting to use only the 1st item (name)
    To avoid collision between the old and the new GridSearch classes.
* FIX test_validate.py: Use 2D X (1D X is being detected as a single sample)
* MAINT validate.py --> validation.py
* MAINT make the submodules private
* MAINT Support old cv/gs/lc until 0.19
* FIX/MAINT n_splits --> get_n_splits
* FIX/TST test_logistic.py/test_ovr_multinomial_iris:
    pass predefined folds as an iterable
* MAINT expose BaseCrossValidator
* Update the model_selection module with changes from master
  - From #5161
  -  - MAINT remove redundant p variable
  -  - Add check for sparse prediction in cross_val_predict
  - From #5201 - DOC improve random_state param doc
  - From #5190 - LabelKFold and test
  - From #4583 - LabelShuffleSplit and tests
  - From #5300 - shuffle the `labels` not the `indxs` in LabelKFold + tests
  - From #5378 - Make the GridSearchCV docs more accurate.
  - From #5458 - Remove shuffle from LabelKFold
  - From #5466(#4270) - Gaussian Process by Jan Metzen
  - From #4826 - Move custom error / warnings into sklearn.exception

Minor
-----

* ENH Make the KFold shuffling test stronger
* FIX/DOC Use the higher level model_selection module as ref
* DOC in check_cv "y : array-like, optional"
* DOC a supervised learning problem --> supervised learning problems
* DOC cross-validators --> cross-validation strategies
* DOC Correct Olivier Grisel's name ;)
* MINOR/FIX cv_indices --> kfold
* FIX/DOC Align the 'See also' section of the new KFold, LeaveOneOut
* TST/FIX imports on separate lines
* FIX use __class__ instead of classmethod
* TST/FIX import directly from model_selection
* COSMIT Relocate the random_state documentation
* COSMIT remove pass
* MAINT Remove deprecation warnings from old tests
* FIX correct import at test_split
* FIX/MAINT Move P_sparse, X, y defns to top; rm unused W_sparse, X_sparse
* FIX random state to avoid doctest failure
* TST n_splits and split wrapping of _CVIterableWrapper
* FIX/MAINT Use multilabel indicator matrix directly
* TST/DOC clarify why we conflate classes 0 and 1
* DOC add comment that this was taken from BaseEstimator
* FIX use of labels is not needed in stratified k fold
* Fix cross_validation reference
* Fix the labels param doc

FIX/DOC/MAINT Addressing the review comments by Arnaud and Andy

COSMIT Sort the members alphabetically
COSMIT len_cv --> n_splits
COSMIT Merge 2 if; FIX Use kwargs
DOC Add my name to the authors :D
DOC make labels parameter consistent
FIX Remove hack for boolean indices; + COSMIT idx --> indices; DOC Add Returns
COSMIT preds --> predictions
DOC Add Returns and neatly arrange X, y, labels
FIX idx(s)/ind(s)--> indice(s)
COSMIT Merge if and else to elif
COSMIT n --> n_samples
COSMIT Use bincount only once
COSMIT cls --> class_i / class_i (ith class indices) -->
perm_indices_class_i

FIX/ENH/TST Addressing the final reviews

COSMIT c --> count
FIX/TST make check_cv raise ValueError for string cv value
TST nested cv (gs inside cross_val_score) works for diff cvs
FIX/ENH Raise ValueError when labels is None for label based cvs;
TST if labels is being passed correctly to the cv and that the
ValueError is being propagated to the cross_val_score/predict and grid
search
FIX pass labels to cross_val_score
FIX use make_classification
DOC Add Returns; COSMIT Remove scaffolding
TST add a test to check the _build_repr helper
REVERT the old GS/RS should also be tested by the common tests.
ENH Add a tuple of all/label based CVS
FIX raise VE even at get_n_splits if labels is None
FIX Fabian's comments
PEP8
2015-10-23 17:28:08 +02:00
Raghav R V e3afc0e8c9 MAINT move custom error/warning classes into sklearn.exceptions
ENH NonBLASDotWarning -> EfficiencyWarning; Improve error message
DOC Add exceptions module to modules/classes.rst
MAINT Move ConvergenceWarning, UndefinedMetricWarning et al into exceptions
MAINT Remove ChangedBehaviorWarning from base
DOC/FIX Improve DataConversionWarning's docstring
2015-10-19 22:35:35 +02:00
Andreas Mueller 31a5a5ff12 Fixed warnings for DataDimensionalityWarning, decision_function and decision_function_shape. 2015-10-14 15:38:07 -04:00
Vighnesh Birodkar 735dd1fdca Fix warnings during tests 2015-10-08 14:52:21 -04:00
Alexandre Gramfort a8585a4b0d pep8 + simplify positive test 2015-08-28 21:43:46 +02:00
mhg d3dec94963 comparison test of Lasso and LassoLars under positive restriction refactored and commented 2015-08-28 13:16:23 +09:00
mhg 98fefd1278 tests for comparison of results for Lasso and LarsLasso added. 2015-08-26 11:44:48 +09:00
mhg 38451a3ea3 tests of positive option for estimator classes condensed. 2015-08-25 15:17:27 +09:00
mhg bbbca0238a tests of positive option for estimator classes 2015-08-25 15:15:28 +09:00
mhg 535536e537 merge with upstream/master 2015-08-25 14:07:56 +09:00
mhg 7d4e8e1563 test lars_path positive constraint. 2015-08-25 13:51:42 +09:00
Arthur Mensch fead69a4ac Bugfix : type in cd changed for read only memmap compatibility 2015-07-31 12:12:40 +02:00
Andreas Mueller a8626b36a6 TST/COSMIT remove nose call boilerplate 2015-05-28 14:54:01 -04:00
Olivier Grisel c1b29375e0 FIX fix test_lars_path_readonly_data failure under Windows 2015-05-21 16:00:52 +02:00
Olivier Grisel dd9641f707 FIX #4597: LassoLarsCV on with readonly folds 2015-05-07 15:43:37 +01:00
Raghav R V cd2ee7e454 MAINT docstring --> comments to prevent nose from using doc in verbose mode 2015-03-21 11:16:49 +05:30
MechCoder f79ac7c187 MAINT: Remove deprecation warnings in enet_path and lasso_path 2014-12-27 00:47:32 +01:00
Olivier Grisel d9067fa295 FIX #3370: better lars alpha path inequality checks for 32 bit support 2014-09-11 13:58:23 -07:00
Lars Buitinck a228e8a49b FIX division by zero warning in LassoLarsIC
Fixes #3576. First time I named a variable after myself.
2014-09-04 15:52:47 +02:00
MechCoder c838c382b9 FIX: Preserve public API by introducing return_n_iter param 2014-07-22 15:09:39 +02:00
MechCoder bbb140aaf0 ENH: Added n_iter_ parameters across all iterative solvers 2014-07-22 15:09:39 +02:00
Olivier Grisel 76ef30b054 TST fix precision failure on windows 2014-07-10 16:39:52 +02:00
Gael Varoquaux 463cea5c7c BUG: test_lasso_lars_vs_lasso_cd_ill_conditioned
Fix failing jenkings
2014-04-24 07:33:23 +02:00
Lars Buitinck 91a45af295 ENH micro-optimize a few tests 2014-04-04 11:27:07 +02:00
Olivier Grisel c50cbbd02a ENH: make CD Lasso raise ConvergenceWarning 2014-04-02 13:47:41 +02:00
GaelVaroquaux 1c73c69eb7 TST: lars tests: more brutal ill-conditionning 2014-04-02 13:47:41 +02:00
GaelVaroquaux 9c80d11efc TST: relax warning class checked in lars 2014-04-02 13:47:41 +02:00
GaelVaroquaux 58ffba9e9f TST: more robust test of dropping in Lars 2014-04-02 13:47:41 +02:00
Olivier Grisel fec2867aee FIX: checked in bad assertion in the last commit by mistake 2014-03-31 22:54:54 +02:00
Olivier Grisel 3445813f78 COSMIT: More readable drop for good test 2014-03-31 21:04:51 +02:00
Lars Buitinck 23b3cc2eb5 MAINT drop support for SciPy < 0.9
TODO: get rid of solve_triangular. Just replacing it by scipy.linalg's
breaks OMP and least-angle regression.
2014-03-02 20:13:57 +01:00
Jaques Grobler 6ebcf4d020 COSMIT fix PEP8 errors 2014-02-02 00:30:28 +11:00
dengemann 4c10c82dbb ENH: address discussion 2013-11-29 13:55:39 +01:00
dengemann e1bdd99ea6 ENH: add assert_warn_message 2013-11-29 13:55:39 +01:00
Alexandre Gramfort 10b048032f API : set return_models to False by default in path functions in coordinate descent 2013-09-29 15:18:13 +02:00
balu 93bc88335a fixed visual indentation errors 2013-08-31 11:54:24 +05:30
Alexandre Gramfort 1c784b9253 ENH : massive refactoring of CV models in coordinate descent. Now the algo core is in path functions 2013-07-23 17:23:13 +02:00
Jaques Grobler d6b0f36f2e make new classes for lasso_path/enet_path and deprecate old 2013-07-23 17:23:13 +02:00
Stefano Lattarini 67ece78da4 COSMIT various typofixes
As suggested by codespell <https://github.com/lucasdemarchi/codespell>

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
2013-04-11 21:22:14 +02:00
Olivier Grisel 5a5268b89f PY3: fix remaining cStringIO imports 2013-03-19 17:57:12 +01:00
Lars Buitinck 541987802f P3K range vs. xrange 2013-02-14 02:05:35 +01:00
Lars Buitinck 85ec0fd1ae P3K death to the print statement 2013-02-11 23:11:57 +01:00
Andreas Mueller bdf2d4b85a TST some more tests for multi output lars 2013-01-29 23:52:55 +01:00
Andreas Mueller 966e10c252 COSMIT PEP8 2012-12-22 16:48:17 +01:00
Andreas Mueller 754c2d9533 COSMIT pep8 2012-12-22 16:48:17 +01:00
Andreas Mueller 8eda5e1c0e TST document and test verbosity parameter of lars_path 2012-12-15 21:18:10 +01:00
Andreas Mueller 08dff76e2c ENH input validation only in ``fit`` in LassoLarsIC, check that error is raised. 2012-12-15 21:17:51 +01:00
Olivier Grisel c9cd2b7292 FIX: lars drop for good platform specific test failure 2012-11-10 20:41:21 +01:00
Gael Varoquaux 7cec21bbee TEST: decrease precision in test_lars_drop_for_good
If the test is wrong, this will be well off. Small errors just reflect
numerical errors
2012-11-10 19:43:17 +01:00