Commit Graph

2830 Commits

Author SHA1 Message Date
jeremiedbb 79a905977b DOC Clean up the advanced installation doc to remove python < 3.5 parts (#13064) 2019-01-30 11:10:49 +11:00
Vishaal Kapoor fdf2f3834e DOC Correct TF-IDF formula in TfidfTransformer comments. (#13054) 2019-01-29 17:50:41 +11:00
Hanmin Qin c1c20971e3 DOC Move datasets.mldata_filename to deprecated section in classes.rst 2019-01-25 11:27:02 +08:00
Joel Nothman 486f8fc543 DOC fix plot_iris references after files renamed 2019-01-17 23:31:48 +11:00
Christos Aridas d2a77d7e78 DOC Add an example of inductive clustering (#10852) 2019-01-17 22:16:22 +11:00
Thomas Fan 7bc20c0e50 DOC Minor changes to DOCS to address sphinx warnings (#12999) 2019-01-17 17:49:31 +08:00
Thomas Fan e4b4834d0a DOC: Fixes link (#12996) 2019-01-17 13:15:19 +11:00
Fibinse Xavier` 9928713ae5 DOC on parallelisation of custom scorer (#12813) 2019-01-15 18:48:45 +11:00
Thomas Fan a7b8b9e9e1 MAINT Removes total_seconds completely in benchmarks (#12969) 2019-01-13 16:41:28 +01:00
Rüdiger Busche d300f406ae MAINT Simplify super() calls (#12812) 2019-01-10 22:27:06 +01:00
Albert Thomas 0eda10a598 FIX Bayesian ridge regression: returned values to match last update (#12174) 2019-01-10 21:36:03 +11:00
Nicolas Hug 0a07364abd ENH Added penalty='none' to LogisticRegression (#12860) 2019-01-10 09:26:30 +11:00
Wenhao Zhang 581752012c ENH refit=callable in *SearchCV adds flexibility in identifying the best estimator (#11354) 2019-01-09 12:56:30 +11:00
Prabakaran Kumaresshan 7c6d92bbd9 DOC Add schematics for cross-validation and grid search (#12281) (#12499) 2019-01-08 17:48:23 +11:00
Nicolas Hug a50c03f975 [MRG] Add pprint for estimators - continued (#11705)
* add pprint for estimators

* strip color from length, add color option

* Minor cleaning, fixes, factoring and docs

* Added some basic tests

* Fixed line length issue

* fixed flake8 and added visual test for review

* Fixed test

* Fixed Python 2 issues (inspect.signature import)

* Trying to fix flake8 again

* Added special repr for functions

* Added some other visual tests

* Changed _format_function in to _format_callable

because callable() returns True also for class objects (which we want to
reprensent with their name as well anyway)

* Consistent output in Python 2 and 3

* WIP

* Now using the builtin pprint module

* pep8

* Added changed_only param

* Fixed printing when string would fit in less than line width

* Fixed printing of steps parameter

* Fixed changed_only param for short estimators

* fixed pep8

* Added some more description in docstring

* changed_only is now an option from set_config()

* Put _pprint.py into sklearn/utils, added tests

* Added doctest NORMALIZE_WHITESPACE where needed

* Fixed tests

* fix test-doc

* fixing test that passed before....

* Fixed tests

* Added test for changed_only and long lines

* typo

* Added authors names

* Added license file

* Added ellipsis based on number of elements in sequence + added increasinly aggressive repr strategies

* Updated whatsnew

* dont use increaingly aggressive strategy

* Fixed tests

* Removed LICENSE file and put license text in _pprint.py

* fixed test_base

* Sorted parameters dictionary for consistent output in 3.5

* Actually using OrderedDict...

* Addressed comments

* Added test for NaN changed parameter

* Update whatsnew

* Added example to set_config()

* Removed example

* Added example in gallery

* Spelling
2018-12-19 23:48:21 -05:00
Nicolas Hug 55a98ab7e3 [MRG+1] Deprecated logistic_regression_path (#12821)
<!--
Thanks for contributing a pull request! Please ensure you have taken a look at
the contribution guidelines: https://github.com/scikit-learn/scikit-learn/blob/master/CONTRIBUTING.md#pull-request-checklist
-->

#### Reference Issues/PRs
<!--
Example: Fixes #1234. See also #3456.
Please use keywords (e.g., Fixes) to create link to the issues or pull requests
you resolved, so that they will automatically be closed when your pull request
is merged. See https://github.com/blog/1506-closing-issues-via-pull-requests
-->

Closes #12798 

#### What does this implement/fix? Explain your changes.

This PR deprecates the use of `logistic_regression_path` and makes it private.

#### Any other comments?


<!--
Please be aware that we are a loose team of volunteers so patience is
necessary; assistance handling other issues is very welcome. We value
all user contributions, no matter how minor they are. If we are slow to
review, either the pull request needs some benchmarking, tinkering,
convincing, etc. or more likely the reviewers are simply busy. In either
case, we ask for your understanding during the review process.
For more information, see our FAQ on this topic:
http://scikit-learn.org/dev/faq.html#why-is-my-pull-request-not-getting-any-attention.

Thanks for contributing!
-->
2018-12-19 16:52:54 -05:00
Andreas Mueller 0554f10ebd DOC typo simple present singular for SGDClassifier in linear model docs (#12804) 2018-12-18 08:43:39 +08:00
adanhawth ff64eae031 DOC Fix LaTeX text{} block escaping of underscores in doc-modules-model_evaluation.rst (#12788) 2018-12-16 09:07:03 +08:00
Katrin Leinweber 8f8f3c8374 DOC Hyperlink DOIs to preferred resolver (#12792) 2018-12-15 23:36:19 +08:00
Andreas Mueller 4603e481e9 DOC Explain solver choices for LogisticRegression (#12768) 2018-12-14 10:30:57 +08:00
Muhammad Hassaan Rafique 10339f7f02 Update linear_model.rst (#12735)
* Update for Logistic-Regression Table Summary for L-BFGS

* Update for linear_model.rst Logistic-Regression L-BFGS summary.

* Update for Logistic-Regression Doc.

* Logistic-Regression Update

* Update linear_model.rst

* Update jnothman comments

* Update jnothman comments

* Update for jnothman comments.

* test

* test2

* test3

* test4

* Update for Comments from amueller and jnothman

* Update for Comments from amueller and jnothman
2018-12-13 06:07:20 -05:00
Emmanuel Arias 72ba30060a ENH Use accuracy instead of micro-average in classification_report (#12758) 2018-12-13 21:00:40 +11:00
Hanmin Qin 7fe3413475 Revert "DOC Fix math typo in model_evaluation's explained_variance (#12747)"
This reverts commit bf2f648639.
2018-12-10 19:53:03 +08:00
Adrin Jalali bf2f648639 DOC Fix math typo in model_evaluation's explained_variance (#12747) 2018-12-10 10:21:44 +08:00
Joel Nothman 654c452291 DOC Revert "DOC Use defined notation for precision and recall (#12726)" (#12743) 2018-12-09 19:42:35 +08:00
Greg Gandenberger 1cb56ba882 DOC Use defined notation for precision and recall (#12726) 2018-12-06 09:10:23 +08:00
Nicolas Hug c1f58745be [MRG] Add elastic net penalty to LogisticRegression (#11646)
* First draft on elasticnet penaly for LogisticRegression

* Some basic tests

* Doc update

* First draft for LogisticRegressionCV.

It seems to be working for binary classification and for multiclass when
multi_class='ovr'. I'm having a hard time figuring out the intricacies
of multi_class='multinomial'.

* Changed default to None for l1_ratio.

added warning message is user sets l1_ratio while penalty is not
elastic-net

* Some more doc

* Updated example to plot elastic net sparsity

* Fixed flake8

* Fixed test by not modifying attribute in fit

* Fixed doc issues

* WIP

* Partially fixed logistic_reg_CV for multinomial.

Also added some comments that are hopefully clear.
Still need to fix refit=False

* Fixed doc issue

* WIP

* Fixed test for refit=False in LogisticRegressionCV

* Fixed Python 2 numpy version issue

* minor doc updates

* Weird doc error...

* Added test to ensure that elastic net is at least as good as L1 or L2
once l1_ratio has been optimized with grid search

Also addressed minor reviews

* Fixed test

* addressed comments

* Added back ignore warning on tests

* Added a functional test

* Scale data in test... Now failing

* elastic-net --> elasticnet

* Updated doc for some attributes and checked their shape in tests

* Added l1_ratio dimension to coefs_paths and scores attr

* improve example + fix test

* FIX incorrect lagged_update in SAGA

* Add non-regression test for SAGA's bug

* FIX flake8 and warning

* Re fixed warning

* Updated some tests

* Addressed comments

* more comments and added dimension to LogisticRegressionCV.n_iter_ attribute

* Updated whatsnew for 0.21

* better doc shape looks

* Fixed whatnew entry after merges

* Added dot

* Addressed comments + standardized optional default param docstrings

* Addessed comments

* use swapaxes instead of unsupported moveaxis (hopefully fixes tests)
2018-11-21 20:23:57 -05:00
Adrin Jalali a816af7d1d API Change the tuple order in make_column_transformer (#12626) 2018-11-21 11:07:12 +08:00
Thomas Moreau d25da1be20 FIX make joblib utils private, and remove mentions of externals.joblib (#12345) 2018-11-20 10:53:52 +11:00
Joel Nothman 9ecada83d8 DOC fix TeX error in Davies Bouldin formula 2018-11-19 17:24:50 +11:00
melsyt 82e095ce95 DOC generative model description etc for LatentDirichletAllocation (#12216) 2018-11-18 20:46:17 +11:00
SylvainLan feed6c7139 DOC fix typos in gaussian_process.rst (#12602) 2018-11-16 14:32:37 +01:00
janvanrijn c47c8a92e4 DOC improved documentation of MissingIndicator (#12424) 2018-11-15 00:30:05 +08:00
Quentin Batista 4b78d7abf4 DOC: Clarify `cv` parameter description in `GridSearchCV` (#12495)
#### Reference Issues/PRs
<!--
Example: Fixes #1234. See also #3456.
Please use keywords (e.g., Fixes) to create link to the issues or pull requests
you resolved, so that they will automatically be closed when your pull request
is merged. See https://github.com/blog/1506-closing-issues-via-pull-requests
-->

This PR addresses issue #12466.

#### What does this implement/fix? Explain your changes.

This PR does the 3 following things:
- Rewrite the `cv` parameter description in `GridSearchCV`
- Link the new `CV splitter` description to an existing example
- Add an example with a custom iterable

Thanks for reviewing this!

Close #12466
2018-11-12 15:10:15 -05:00
Andreas Mueller 54de1896f5 DOC (0.21) Make sure plot_tree docs are generated and fix link in whatsnew (#12533) 2018-11-07 10:25:57 +08:00
Joel Nothman 1128094271 BLD we should ensure continued support for joblib 0.11 (#12350) 2018-11-06 22:10:23 +01:00
Thomas Fan 9f842e3496 API Adds passthrough option to Pipeline (#11674) 2018-11-05 13:21:57 +11:00
Thomas Fan 478267ed13 DOC Small fix in compose.rst (#12487) 2018-10-31 13:37:18 +11:00
Shangwu Yao 65556317c9 FEA (0.21) multilabel confusion matrix (#11179) 2018-10-30 19:26:37 +08:00
daten-kieker a1fabce653 DOC Mention of pairwise_distances in Guide on Metrics (#12416) 2018-10-30 09:47:50 +08:00
mail-liam d4802aeac5 Fix mean shift equation as per issue 12420 (#12455)
#### Reference Issues/PRs
Fixes #12420 

#### What does this implement/fix? Explain your changes.
Updates the mean shift equation as per issue 12420
2018-10-29 11:55:58 -04:00
Lisa Sarah Thomas dc883c7d9e ENH Corrected spelling of Harabasz score. (#12211) 2018-10-24 15:38:39 +08:00
Scott Lowe 99bea79857 DOC: Fix typo where FMI was referred to as AMI (#12414) 2018-10-21 15:51:20 +11:00
Pulkit Maloo d9b56b666d DOC DecisionTreeClassifier does not support categorical data (#12402) 2018-10-18 17:48:39 +11:00
Nicolas Hug d4c9e849ba DOC minor clarifications in ensemble.rst (#11810) 2018-10-17 21:03:24 +11:00
Andreas Mueller c13ba26c47
[MRG] Matplotlib tree plotting (#9251)
* add reingold tillford tree layout algorithm

* add first silly implementation of matplotlib based plotting for trees

* object oriented design for export_graphviz so it can be extended

* add class for mlp export

* add colors

* separately scale x and y, add arrowheads, fix strings

* implement max_depth

* don't use alpha for coloring because it makes boxes transparent

* remove unused variables

* vertical center of boxes

* fix/simplify newline trimming

* somewhere in the middle of stuff

trying to get rid of scalex, scaley

* remove "find_longest_child" for now, fix tests

* make scalex and scaley internal, and ax local.

render everything once to get the bbox sizes, then again to actually plot it with known extents.

* add some margin to the max bbox width

* add _BaseTreeExporter baseclass

* add docstring to plot_tree

* use data coordinates so we can put the plot in a subplot, remove some hacks.

* remove scalex, scaley, add automatic font size

* use rendered stuff for setting limits (well nearly there)

* import plot_tree into tree module

* set limits before font size adjustment?

* add tree plotting via matplotlib to iris example and to docs

* pep8 fix

* skip doctest on plot_tree because matplotlib is not installed on all CI machines

* redo everything in axis pixel coordinates

re-introduce scalex, scaley
add max_extents to tree to get tree size before plotting

* fix max-depth

parent node positioning and don't consider deep nodes in layouting

* consider height in fontsize computation

in case someone gave us a very flat figure

* fix error when max_depth is None

* add docstring for tree plotting fontsize

* starting on jnothman's review

* renaming fixes

* whatsnew for tree plotting

* clear axes prior to doing anything.

* fix doctests

* skip matplotlib doctest

* trying to debug circle failure

* trying to show full traceback

* more print debugging

* remove debugging crud

* hack around matplotlib <1.5 issues

* copy bbox args because old matplotlib is weird.

* pep8 fixes

* add explicit boxstyle

* more pep8

* even more pep8

* add comment about matplotlib version requirement

* remove redundant file

* add whatsnew entry that the merge lost

* fix merge issue

* more merge issues

* whitespace ...

* remove doctest skip to see what's happening

* added some simple invariance tests buchheim function

* refactor
___init__ into superclass

* added some tests of plot_tree

* put skip back in, fix typo, fix versionadded number

* remove unused parameters special_characters and parallel_leaves from mpl plotting

* rename tests to test_reingold_tilford

* added license header from pymag-trees repo

* remove duplicate test file.
2018-10-11 15:42:02 -04:00
Andreas Mueller 0f94f2962b
MNT simple deprecations and removals for 0.21 (#12238)
Part of #11992.
These were all the things that seemed pretty straight-forward. It's actually a bit bulky but should still be easy to review, hopefully.
2018-10-11 14:56:37 -04:00
Krishna Sangeeth 831c760ccf ENH (0.21) Add max_error to the existing set of metrics for regression (#12232) 2018-10-11 15:33:06 +08:00
TakingItCasual f4e7d2b19a Converting http to https (3)... (#12302) 2018-10-05 18:50:31 +02:00
Denis Kataev b020f62250 MNT Apply pep8 to docs code (#12275) 2018-10-05 22:51:42 +08:00