Commit Graph

159 Commits

Author SHA1 Message Date
Arnaud Rachez 5db2adf93c MAINT Removed deprecated stuff. 2015-10-21 10:24:23 +02:00
Gilles Louppe a4e4cf9875 FIX: remove shuffling in LabelKFold 2015-10-19 16:27:04 +02:00
Gilles Louppe 1f4bc26a02 FIX: Ensure correct LabelKFold folds when shuffle=True 2015-09-25 13:26:34 +02:00
TomDLT 628ed2c867 ENH remove some warnings in test suit 2015-09-16 18:27:58 +02:00
Gilles Louppe cf7bc7b035 ENH: rename to LabelKFold
COSMIT: doc, pep8, etc

Refactor code
2015-09-07 09:56:19 +02:00
Jean Kossaifi 6eb4028519 Added subject independent KFold
Changed SubjectIndependentKFold to DisjointGroupKFold

cosmetic changes  test (fix seed correctly, use assert_equal for
meaningful error messages)

Changed name to DisjointLabelKFold

Added example of use

FIX: whitespace related doctest failure

FIX: Python 2.6 requires the field numbers in print

FIX: change docstring to comment in test function

DOC: moved docstring from function to class

FIX: added call to parent class

FIX: error in calling the parent

DOC: fixed doctest

FIX: doctest

Cosmetic changes (minor refactoring)

Optimised code (use np.bincount)

Cosmetic: use samples instead of weight for clarity

Minor fix: removed shuffle parameter

Cosmetic

Use mergesort instead of quicksort for reproducibility.

Changed variable name 'y' to 'label'.

Added test for degenerate case where n_folds > n_labels.

Documented the requirement n_labels > n_folds.

DOC: improved description + added see also sections.

Fixed dtype of temporary arrays.

Improved test: check that one label is not in both test and training.

Added documentation for DisjoinLabelKFold.
2015-09-07 09:53:58 +02:00
Brian McFee 21a966ae8a ENH: added LabelShuffleSplit cv iterator 2015-08-30 12:00:18 +02:00
Olivier Grisel ea42c55b7b PEP8 in cross_validation module + tests 2015-08-27 15:34:41 +02:00
Buddha Prakash b68f922707 Fix minor indentation issues 2015-08-26 18:26:21 +05:30
Buddha Prakash 0c6b1733ac Add test to check sparse predictions in cross_val_predict 2015-08-26 17:25:35 +05:30
Raghav R V 664d78eb7c MAINT Remove support for the deprecated sequence of sequences
MAINT Remove sequence of sequence support from datasets
MAINT Remove return_indicator param
MAINT Remove multilabel-seq test in OVR
MAINT Remove multilable-seq test in check_cv
MAINT Remove multilabel seq test in label_binarizer
TST type_of_target returns "unknown" for multilabel-sequence types
TST _check_targets should raise a ValueError
DOC show multilabel indicator as an example; remove return_indicator param
DOC use consistent lower case y for target
2015-08-11 22:26:44 +05:30
Raghav R V 62325cbb58 MAINT merge _check_cv into check_cv as indices argument is removed in 0.17 2015-06-08 16:37:03 +05:30
Andreas Mueller c5b395fb3e FIX / TST make cross_val_predict work on lists, test pass-through and compatibility with various input types. 2015-05-19 15:04:45 -04:00
Miroslav Batchkarov 52244dc6df incorporated amueller's feedback 2015-04-24 10:08:19 +01:00
Miroslav Batchkarov 803dcc10a2 fixed issue when train_size < test_size for stratified 2015-03-23 19:44:51 +00:00
Miroslav Batchkarov 34c85ed995 [WIP] preliminary implementation of stratified train_test_split
Broken when train_size < test_size
2015-03-23 19:19:40 +00: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
Andreas Mueller e1af92b640 remove cross_validation.Bootstrap 2015-03-18 14:51:37 -04:00
Andreas Mueller 6beacc3fb6 remove deprecated stuff from 0.17 2015-03-18 14:49:04 -04:00
Andreas Mueller f1b8283c95 catch some warnings, be less verbose in testing. 2015-03-02 14:40:35 -05:00
bhsu 13b6aec5f3 non-inheriting estimator added for rfe, cross validation, and pipeline tests
non-inheriting estimator added for cross validation

non-inheriting estimator added for pipeline

reconciled diffs
2015-01-29 22:02:38 -05:00
Andreas Mueller e3f94351f2 TST Silence some tests. 2015-01-29 17:24:41 -05:00
Lars 17726d2481 Merge pull request #4141 from amueller/bootstrap_int_one_fix
[FIX] Bootstrap with test_size=1 fix
2015-01-24 15:24:18 +01:00
Andreas Mueller edb73cc693 FIX check for integer 1 before checking for floating 1 (isinstance(1, numbers.real) == True) 2015-01-21 15:53:03 -05:00
Thomas Unterthiner a6723edca5 ENH: cross-validate over predefined splits 2015-01-21 13:04:50 +01:00
akshayah3 91c03a433a Added helper function 2015-01-06 19:21:08 +05:30
akshayah3 5b9653334f Sparse inputs for fit_params 2015-01-05 16:14:36 +05:30
Joel Nothman 79eabdda25 FIX correct name due to rebase error 2014-12-25 23:33:27 +11:00
Andreas Mueller 3d1ede915a TST add tests for nd grid-search can train_test_split 2014-12-25 23:08:44 +11:00
Andreas Mueller 7a38062c24 FIX backward compatibility.
force_arrays was never in a release, allow_nd was a legal option to ``train_test_split`` that raises an error in master.
2014-12-19 12:15:03 -05:00
Lars Buitinck 40c03d4880 COSMIT pep8 fixes to sklearn/tests 2014-12-18 16:40:01 +01:00
Aldrian Obaja 1e8bdb859e FIX bug in fit_params assumed to be an array
Fixes gh-3957.
2014-12-15 18:07:05 +01:00
Joel Nothman 081a554698 FIX P/R/F metrics and scorers are now for binary problems only by default
Scorers for different average parameters have been added.
2014-12-09 13:56:51 +11:00
Gael Varoquaux 1d6566bd59 Merge pull request #3690 from queqichao/fix_bug_in_cross_validation_when_using_sparse_matrix_for_fit_params
+ Fix the bug of calling len when using sparse matrix for fit_params in ...
2014-11-24 23:37:33 +01:00
Luis Pedro Coelho 2f275de41d ENH Add cross_val_predict function
This function returns the cross-validated prediction for each element in
the input data (i.e., the prediction that is made when that object is in
the test set).
2014-11-03 11:51:10 +11:00
queqichao f1f9760ff6 + Fix the bug of calling len when using sparse matrix for fit_params in cross_validation.py.
+ Add test case for the above fix.
2014-09-22 23:09:25 -04:00
Nikolay Mayorov e8942057cc FIX Implemented correct handling of multilabel y in cross_val_score 2014-07-29 11:49:58 +02:00
Olivier Grisel 99c25020a6 COSMIT smipler & more robust check in test_kfold_valueerrors
Using assert_warn_message internally cleans the warning
registries making this test more robust to changes in other tests.
2014-07-28 17:00:13 +02:00
Andreas Mueller b080d93b5e ENH don't convert dataframes in grid search and cross-validation 2014-07-18 10:02:14 +02:00
Olivier Grisel 3318c9c9ca TST speedup test_permutation_score
Also remove a warning with fbeta score that had non enought samples of
a specific class by chance.
2014-07-17 17:11:20 +02:00
Arnaud Joly 8de00d857f Merge pull request #3411 from lesteve/scheduled-removal-from-0.15
[MRG] Remove deprecated parameters whose removal was scheduled for 0.15
2014-07-17 16:57:30 +02:00
lesteve b12d1ac487 Remove deprecated 'score_func' and 'loss_func' parameters from sklearn.metrics.scorer.check_scoring. Amend the code in all the other places they were used. 2014-07-17 13:53:06 +01:00
Andreas Mueller e242ebc5c7 ENH rename parameters in MockListClassifiers. 2014-07-16 16:20:10 +02:00
Andreas Mueller 5fe7c2ca2f add test for safe_indexing, add another test for cross_val_score 2014-07-16 11:31:41 +02:00
Andreas Mueller 3c7818e8cf ENH allow y to be a list in GridSearchCV, cross_val_score and train_test_split. 2014-07-16 10:59:57 +02:00
Ronald Phlypo 59d6a11a57 bug fix and deprectation warning added to cross-validation 2014-06-21 21:39:51 +02:00
Alexandre Gramfort de824b1b1f FIX : allow nd X for cross_val_score (was working in 0.14)
Fixes #3277.
2014-06-15 14:27:08 +02:00
Jeffrey Blackburne b67ba03f4c ENH shuffle option for StratifiedKFold 2014-05-05 12:53:01 +10:00
Yung Siang Liau 3f9dff942d FIX: Add allow_nans option to check_arrays
Grid search and cross validation should not panic when seeing NaNs
in the input arrays, because that breaks Imputer.
Fixes #2774 and #3044.
2014-04-13 16:59:52 +02:00
Lars Buitinck aeb1dcdf1f FIX cross_val_score to take y as a list 2014-03-27 11:20:30 +01:00