Commit Graph

2592 Commits

Author SHA1 Message Date
Karl F 187b32de08 DOC Fix three typos in manifold documentation (#9990) 2017-10-24 23:06:52 +11:00
Kyeongpil Kang e0a29977cf [MRG+1] DOC fix sign in GBRT mathematical formulation (#9885) 2017-10-20 12:17:50 +02:00
Hanmin Qin 45d1dd2e99 DOC Add missing class (#9955) 2017-10-19 18:28:58 +11:00
Michael A. Alcorn 65ccd92fda [MRG+1] Add norm parameter to ComplementNB. (#9916) 2017-10-17 18:57:26 +02:00
Aman Dalmia 8daad062f1 [MRG+1] Adding support for balanced accuracy (#8066)
* add function computing balanced accuracy

* documentation for the balanced_accuracy_score

* apply common tests to balanced_accuracy_score

* constrained to binary classification problems only

* add balanced_accuracy_score for CLF test

* add scorer for balanced_accuracy

* reorder the place of importing balanced_accuracy_score to be consistent with others

* eliminate an accidentally added non-ascii character

* remove balanced_accuracy_score from METRICS_WITH_LABELS

* eliminate all non-ascii charaters in the doc of balanced_accuracy_score

* fix doctest for nonexistent scoring function

* fix documentation, clarify linkages to recall and auc

* FIX: added changes as per last review See #6752, fixes #6747

* FIX: fix typo

* FIX: remove flake8 errors

* DOC: merge fixes

* DOC: remove unwanted files

* DOC update what's new
2017-10-17 11:12:27 -04:00
Joel Nothman f05a95b103 [MRG] FIX Revert the addition of ndcg_score and dcg_score (#9932) 2017-10-17 09:34:25 +11:00
Kumar Ashutosh 01d8a342fa [MRG] Deprecates gaussian process regression_models and correlation_models. (#9717)
Forgotten from earlier deprecation
2017-10-16 12:27:06 +11:00
kyledrogo a0dfa30696 [MRG+1] Ledoit-Wolf behavior explanation (#9500)
* DOC add explaination of unexpected behavior to ledoit-wolf functions and class

* DOC add explaination of unexpected ledoit-wolf behavior to module documentation

* fix line that's longer than 80 chars, pep8 issue

* fix documentation changes to Ledoit_Wolf behavior explaination

* change bahavior explanation to a note in documentation

* remove unexpected behavior explanation from docstrings

* fix broken links in docs
2017-10-08 13:29:35 +11:00
syonekura 32fcc364ab [MRG+1] Setting max_iter/tol explicitly for SGD estimators in docs (#9776) 2017-10-04 17:28:32 +02:00
Christian Hogan 6ddb881523 DOC Resolve typo in nearest neighbors regression docs (#9831) 2017-09-26 17:41:33 +10:00
Anthony Gitter 59bb32ff71 DOC Add average precision definitions and cross references (#9583) 2017-09-25 20:04:21 +10:00
brett koonce f2186aa19d various minor spelling tweaks (#9783) 2017-09-17 17:04:23 +02:00
Albert Thomas 48afa9d85d [MRG] Deprecate random_state in OneClassSVM and add clarifications in docstrings and doc (#9703) 2017-09-08 08:38:20 +10:00
Shahebaz 95d0ae6dfb [MRG+1] DOC fix headers level in cross_validation.rst (#9679) 2017-09-04 15:31:37 +02:00
Kumar Ashutosh e66aa6dc70 ENH Ducktyping to allow for alternative Memory implementations (#9584) 2017-08-30 15:21:24 +10:00
Michael A. Alcorn 026e10a24f [MRG] Fix math syntax for ComplementNB documentation. (#9644) 2017-08-29 22:18:57 +02:00
Ben Lawson 0b8a9360f0 update dead link to pyamg (#9640)
pyamg.org has moved to github
2017-08-28 15:15:14 -04:00
Michael A. Alcorn a571b01ac8 ENH Implement Complement Naive Bayes (#8190) 2017-08-28 23:31:45 +10:00
Guillaume Lemaitre 89b02af431 [MRG+1] EHN Accept 1D array for preprocessing functions and update doc (#9596)
* EHN/TST robust_scale accepts 1D array

* DOC update doc for preprocessing functions
2017-08-22 19:08:47 +03:00
Hanmin Qin ee2025f282 [MRG+1] Add scorer based on brier_score_loss (#9521) 2017-08-22 08:27:41 +10:00
Andreas Mueller c7ca0c58ee [MRG+1] FIX n_iter -> max_iter conversion in SGDClassifier (#9558)
* move n_iter -> max_iter conversion and warning into _check_params in SGDClassifier for proper deprecation.

* move validate_params so we have self._max_iter in _fit

* validate params in init because the tests wants me to

* better check for input validation

* fix deprecation tests to call _validate_params

* fix parameter validation in PA classifier

* fix max_iter in doctests

* pep8 /doctest whitespace

* more doctests

* maybe I'll find them all....
2017-08-16 16:25:53 -07:00
Nagarjuna Kumar ded2276d88 Fixed typos in tf-idf term weighting section (#9547) 2017-08-14 13:22:17 -04:00
diegodlh 88f529efa6 Fixed impossible min_samples_split value (#9520) 2017-08-11 15:38:52 -07:00
Joel Nothman 44ba589101 DOC a note on data leakage and pipeline (#9510) 2017-08-10 18:18:21 +10:00
Hanmin Qin 9f91ec7ffd [MRG+1] add scorer based on explained_variance_score (#9259) 2017-08-08 10:02:15 +02:00
Joel Nothman f2f557d1ea DOC Use :class: for first VotingClassifier reference 2017-07-30 22:16:39 +10:00
Balakumaran Manoharan 04be1a9799 [MRG + 1] DOC Fix Sphinx errors (#9420)
* Fix Rouseeuw1984 broken link

* Change label vbgmm to bgmm
Previously modified with PR #6651

* Change tag name
Old refers to new tag added with PR #7388

* Remove prefix underscore to match tag

* Realign to fit 80 chars

* Link to metrics.rst.
pairwise metrics yet to be documented

* Remove tag as LSHForest is deprecated

* Remove all references to randomized_l1 and sphx_glr_auto_examples_linear_model_plot_sparse_recovery.py.
It is deprecated.

* Fix few Sphinx warnings

* Realign to 80 chars

* Changes based on PR review

* Remove unused ref in calibration

* Fix link ref in covariance.rst

* Fix linking issues

* Differentiate Rouseeuw1999 tag within file.

* Change all duplicate Rouseeuw1999 tags

* Remove numbers from tag Rousseeuw
2017-07-30 15:22:10 +10:00
Naoya Kanai f6c7080ee5 DOC Clarify RobustScaler behavior with sparse input (#8858) 2017-07-29 22:23:46 +10:00
Hanmin Qin b03abf1985 [MRG+1] DOC improve RFE/RFECV estimator docstring (#9233) 2017-07-27 14:39:42 +02:00
Balakumaran Manoharan d82bc5e5eb [MRG+1] Rearrange modules in alphabetical order (#9449) 2017-07-27 13:16:01 +02:00
(Venkat) Raghav, Rajagopalan 02a31f0a89 [MRG] DOC use def instead of lambda in the multimetric example at model_evaluation.rst (#9442) 2017-07-26 09:32:35 +02:00
Aarshay Jain 11e7369034 [MRG + 1] Multiclass Documentation update (#9419) 2017-07-25 10:26:05 +02:00
Sebastin Santy 4aef698a7b [MRG] Formatting error in cross_validation.rst (#9415)
* Formatting error in cross_validation.rst

* Formatting error in cross_validation.rst

* Minor change
2017-07-19 21:33:14 +02:00
Sailesh Choyal c1542850c5 [MRG+1] Add links for [RW2006] (#9412)
* Add links for [RW2006]

* Update [RW2006] reference link
2017-07-19 12:04:57 -05:00
Balakumaran Manoharan 98a66d91b7 DOC Fix multi metric link in model selection (#9410) 2017-07-19 17:57:33 +10:00
Warut Vijitbenjaronk 8485d3eb5c [MRG] Add Explanation of MSE vs Friedman MSE vs MAE criterion in Regression Tree Building (#9367)
* clarified documentation for regression tree criterion

* added explanation on doc/modules/tree.rst
2017-07-17 10:02:18 -07:00
Joel Nothman 7c878137cf Merge branch 'master' of github.com:scikit-learn/scikit-learn 2017-07-17 11:39:57 +10:00
Joel Nothman ef75578631 DOC markup fixes and grammar 2017-07-17 11:27:56 +10:00
(Venkat) Raghav, Rajagopalan 75d6005fea [MRG] Add few more tests + Documentation for re-entrant cross-validation estimators (#7823)
* DOC Add NOTE that unless random_state is set, split will not be identical

* TST use np.testing.assert_equal for nested lists/arrays

* TST Make sure cv param can be a generator

* DOC rank_ becomes a link when rendered

* Use test_...

* Remove blank line; Add if shuffle is True

* Fix tests

* Explicitly test for GeneratorType

* TST Add the else clause

* TST Add comment on usage of np.testing.assert_array_equal

* TYPO

* MNT Remove if ;

* Address Joel's comments

* merge the identical points in doc

* DOC address Andy's comments

* Move comment to before the check for generator type
2017-07-17 08:58:59 +10:00
Andreas Mueller c71e1275ea minor sphinx fixes (#9370) 2017-07-15 16:09:06 -07:00
Sebastin Santy 8bb764c857 [MRG+1] AffinityPropagation damping factor not explained (#9335)
* AffinityPropagation damping factor not explained

* Added for API also

* Add equation for damping

* formatting text

* Add suggestions
2017-07-13 17:37:25 +02:00
Joel Nothman ba7224869f [MRG] DOC cleaning up what's new for 0.19 (#9252)
* DOC cleaning up what's new for 0.19

* More cleaning up

* More cleaning up

* Deprecations

* Clean up merge

* Update

* TODOs to prose and minor changes

* Changed models and minor fixes

* sort

* Merge in 0.18.2 docs

* Missing entry from 0.18 logs

* Optimistically add some features to highlights

* Forgotten user directive

* Fix alignment

* Cleaning up for Andy's comments

* Mention beta_loss=0 speedup

* Update

* Clean up new what's new entries

* DOC Add changes missed from what's new

And other minor things.

This took lots of effort which I would have not committed where I not home sick...
2017-07-13 15:54:32 +10:00
Tom Dupré la Tour e55d0bcba5 FIX broken link in gallery and bad title rendering 2017-07-12 16:37:49 +02:00
Joel Nothman e550a5b1f3 [MRG] DOC Replace \acute by prime (#9332) 2017-07-12 20:47:39 +10:00
(Venkat) Raghav, Rajagopalan a08555a238 [MRG + 2] ENH Allow `cross_val_score`, `GridSearchCV` et al. to evaluate on multiple metrics (#7388)
* ENH cross_val_score now supports multiple metrics

* DOCFIX permutation_test_score

* ENH validate multiple metric scorers

* ENH Move validation of multimetric scoring param out

* ENH GridSearchCV and RandomizedSearchCV now support multiple metrics

* EXA Add an example demonstrating the multiple metric in GridSearchCV

* ENH Let check_multimetric_scoring tell if its multimetric or not

* FIX For single metric name of scorer should remain 'score'

* ENH validation_curve and learning_curve now support multiple metrics

* MNT move _aggregate_score_dicts helper into _validation.py

* TST More testing/ Fixing scores to the correct values

* EXA Add cross_val_score to multimetric example

* Rename to multiple_metric_evaluation.py

* MNT Remove scaffolding

* FIX doctest imports

* FIX wrap the scorer and unwrap the score when using _score() in rfe

* TST Cleanup the tests. Test for is_multimetric too

* TST Make sure it registers as single metric when scoring is of that type

* PEP8

* Don't use dict comprehension to make it work in python2.6

* ENH/FIX/TST grid_scores_ should not be available for multimetric evaluation

* FIX+TST delegated methods NA when multimetric is enabled...

TST Add general tests to GridSearchCV and RandomizedSearchCV

* ENH add option to disable delegation on multimetric scoring

* Remove old function from __all__

* flake8

* FIX revert disable_on_multimetric

* stash

* Fix incorrect rebase

* [ci skip]

* Make sure refit works as expected and remove irrelevant tests

* Allow passing standard scorers by name in multimetric scorers

* Fix example

* flake8

* Address reviews

* Fix indentation

* Ensure {'acc': 'accuracy'} and ['precision'] are valid inputs

* Test that for single metric, 'score' is a key

* Typos

* Fix incorrect rebase

* Compare multimetric grid search with multiple single metric searches

* Test X, y list and pandas input; Test multimetric for unsupervised grid search

* Fix tests; Unsupervised multimetric gs will not pass until #8117 is merged

* Make a plot of Precision vs ROC AUC for RandomForest varying the n_estimators

* Add example to grid_search.rst

* Use the classic tuning of C param in SVM instead of estimators in RF

* FIX Remove scoring arg in deafult scorer test

* flake8

* Search for min_samples_split in DTC; Also show f-score

* REVIEW Make check_multimetric_scoring private

* FIX Add more samples to see if 3% mismatch on 32 bit systems gets fixed

* REVIEW Plot best score; Shorten legends

* REVIEW/COSMIT multimetric --> multi-metric

* REVIEW Mark the best scores of P/R scores too

* Revert "FIX Add more samples to see if 3% mismatch on 32 bit systems gets fixed"

This reverts commit ba766d98353380a186fbc3dade211670ee72726d.

* ENH Use looping for iid testing

* FIX use param grid as scipy's stats dist in 0.12 do not accept seed

* ENH more looping less code; Use small non-noisy dataset

* FIX Use named arg after expanded args

* TST More testing of the refit parameter

* Test that in multimetric search refit to single metric, the delegated methods
  work as expected.
* Test that setting probability=False works with multimetric too
* Test refit=False gives sensible error

* COSMIT multimetric --> multi-metric

* REV Correct example doc

* COSMIT

* REVIEW Make tests stronger; Fix bugs in _check_multimetric_scorer

* REVIEW refit param: Raise for empty strings

* TST Invalid refit params

* REVIEW Use <scorer_name> alone; recall --> Recall

* REV specify when we expect scorers to not be None

* FLAKE8

* REVERT multimetrics in learning_curve and validation_curve

* REVIEW Simpler coding style

* COSMIT

* COSMIT

* REV Compress example a bit. Move comment to top

* FIX fit_grid_point's previous API must be preserved

* Flake8

* TST Use loop; Compare with single-metric

* REVIEW Use dict-comprehension instead of helper

* REVIEW Remove redundant test

* Fix tests incorrect braces

* COSMIT

* REVIEW Use regexp

* REV Simplify aggregation of score dicts

* FIX precision and accuracy test

* FIX doctest and flake8

* TST the best_* attributes multimetric with single metric

* Address @jnothman's review

* Address more comments \o/

* DOCFIXES

* Fix use the validated fit_param from fit's arguments

* Revert alpha to a lower value as before

* Using def instead of lambda

* Address @jnothman's review batch 1: Fix tests / Doc fixes

* Remove superfluous tests

* Remove more superfluous testing

* TST/FIX loop over refit and check found n_clusters

* Cosmetic touches

* Use zip instead of manually listing the keys

* Fix inverse_transform

* FIX bug in fit_grid_point; Allow only single score

TST if fit_grid_point works as intended

* ENH Use only ROC-AUC and F1-score

* Fix typos and flake8; Address Andy's reviews

MNT Add a comment on why we do such a transpose + some fixes

* ENH Better error messages for incorrect multimetric scoring values +...

ENH Avoid exception traceback while using incorrect scoring string

* Dict keys must be of string type only

* 1. Better error message for invalid scoring 2...
Internal functions return single score for single metric scoring

* Fix test failures and shuffle tests

* Avoid wrapping scorer as dict in learning_curve

* Remove doc example as asked for

* Some leftover ones

* Don't wrap scorer in validation_curve either

* Add a doc example and skip it as dict order fails doctest

* Import zip from six for python2.7 compat

* Make cross_val_score return a cv_results-like dict

* Add relevant sections to userguide

* Flake8 fixes

* Add whatsnew and fix broken links

* Use AUC and accuracy instead of f1

* Fix failing doctests cross_validation.rst

* DOC add the wrapper example for metrics that return multiple return values

* Address andy's comments

* Be less weird

* Address more of andy's comments

* Make a separate cross_validate function to return dict and a cross_val_score

* Update the docs to reflect the new cross_validate function

* Add cross_validate to toc-tree

* Add more tests on type of cross_validate return and time limits

* FIX failing doctests

* FIX ensure keys are not plural

* DOC fix

* Address some pending comments

* Remove the comment as it is irrelevant now

* Remove excess blank line

* Fix flake8 inconsistencies

* Allow fit_times to be 0 to conform with windows precision

* DOC specify how refit param is to be set in multiple metric case

* TST ensure cross_validate works for string single metrics + address @jnothman's reviews

* Doc fixes

* Remove the shape and transform parameter of _aggregate_score_dicts

* Address Joel's doc comments

* Fix broken doctest

* Fix the spurious file

* Address Andy's comments

* MNT Remove erroneous entry

* Address Andy's comments

* FIX broken links

* Update whats_new.rst

missing newline
2017-07-07 11:12:31 -04:00
Utkarsh Upadhyay 0dc22798e7 [MRG+1] Fix semi_supervised (#9239)
* Files for my dev environment with Docker

* Fixing label clamping (alpha=0 for hard clamping)

* Deprecating alpha, fixing its value to zero

* Correct way to deprecate alpha for LabelPropagation

The previous way was breaking the test
sklearn.tests.test_common.test_all_estimators

* Detailed info for LabelSpreading's alpha parameter

Based on the original paper.

* Minor changes in the deprecation message

* Improving "deprecated" doc string and raising DeprecationWarning

* Using a local "alpha" in "fit" to deprecate LabelPropagation's alpha

This solution isn't great, but it sets the correct value for alpha
without violating the restrictions imposed by the tests.

* Removal of my development files

* Using sphinx's "deprecated" tag (jnothman's suggestion)

* Deprecation warning: stating that the alpha's value will be ignored

* Use __init__ with alpha=None

* Update what's new

* Try fix RuntimeWarning in test_alpha_deprecation

* DOC Indent deprecation details

* DOC wording

* Update docs

* Change to the one true implementation.

* Add sanity-checked impl. of Label{Propagation,Spreading}

* Raise ValueError if alpha is invalid in LabelSpreading.

* Add a normalizing step before clamping to LabelPropagation.

* Fix flake8 errors.

* Remove duplicate imports.

* DOC Update What's New.

* Specify alpha's value in the error.

* Tidy up tests.

Add a test and add references, where needed.

* Add comment to non-regression test.

* Fix documentation.

* Move check for alpha into fit from __init__.

* Fix corner case of LabelSpreading with alpha=None.

* alpha -> self.variant

* Make Whats_new more explicit.

* Simplify impl. of Label{Propagation,Spreading}.

* variant -> _variant.
2017-07-04 08:20:52 +10:00
Taehoon Lee 5d7df621a1 Fix typos (#9265) 2017-07-03 12:27:53 +02:00
Joel Nothman 9996491e1a DOC wording 2017-07-01 21:05:55 +10:00
Roman Yurchak b46e6382da Custom token processor example (#7286) 2017-07-01 00:04:11 +02:00
Ramana Subramanyam c10c88622a Deprecate randomized_l1 (#9031) 2017-06-30 18:20:25 +02:00