Commit Graph

264 Commits

Author SHA1 Message Date
Aseem Bansal 2bf5006ef7 spelling mistake (#8341) 2017-02-12 16:53:58 +01:00
Asish Mahapatra c6b2002ece Remove redefinition of k_fold in model_selection.rst (#8330) 2017-02-11 14:10:22 +01:00
seanpwilliams bae38a2f5f DOC: Remove superfluous assignment in tutorial. issue #8285 (#8314)
* remove assignment

per recommendation

* Fix doctests
2017-02-08 19:10:54 +11:00
Andreas Mueller 5c4b1bb231 [MRG+1] Housekeeping Deprecations for v0.19 (#7927)
* remove stuff to be removed 0.19

* more changes

* remove classes from 0.19 whatsnew

* remove _LearntSelectorMixin

* remove ProjectedGradientNMF, load_lwf_*

* minor fixes

* remove more copy from logistic regression path

* remove lda, qda from __init__.__all__

* remove pg solver in nmf from tests etc

* remove class_weight="auto" from tests

* doctest change for decision_function_shape="ovr"

* remove transfrom from tree test, minor fixes to tree tests

* some fixes in the tests

* undo changes in functions which still allow 1d input...

* also allow 1d in scale

* more test fixes...

* last test fixes in forest and tree

* svm default value change doctest failures

* pep8

* remove more class_weight="auto" stuff

* minor cosmetics in docstrings deprecated / removed behavior.

* say that store_covariance has been moved to __init__ in discriminant_analysis
2016-12-09 12:43:38 -05:00
jeroko b2af911cf8 DOC Remove unnecessary module prefix in example code. (#7884)
MultiLabelBinarizer is already imported, calling it with the
``preprocessing`` module prefix produces an error.
2016-11-16 13:25:49 +11:00
Giorgio Patrini 8f938eec05 DOC fixed avoidable warning of test-doc (#7524) 2016-10-10 20:15:40 +11:00
He Chen ea752cd6d2 [MRG + 1] Added some documentation for loading external datasets (Issue 3808) (#7516)
* Update tutorial.rst

* Update tutorial.rst

* Update tutorial.rst

* Update tutorial.rst

* Update index.rst

* Update index.rst

* Update tutorial.rst

* Update tutorial.rst

* Update tutorial.rst

* Update faq.rst

* Update faq.rst

* Divided in two cases (standard columnar and misc data)

I also added a preprocessing note at the end

* Update tutorial.rst

* Update faq.rst

* Update index.rst

Also added some references that were in the original FAQ and pointed the FAQ to here

* Update index.rst

Added the information from the removed part of the FAQ because I felt that the FAQ version was better than the explanation I gave.

* Update index.rst

reference to skimage and also has sklearn.preprocessing.OneHotEncoder instead of OneHotEncoder

* Update index.rst

* Update index.rst

Changed with @jnothman's feedback 
d16ac523ed

* Update faq.rst

* optimized file formats added to datasets/index.rst

Note: if you manage your own numerical data it is recommended to use an optimized file format such as HDF5 to reduce data load times. Various libraries such as H5Py, PyTables and pandas provides a Python interface for reading and writing data in that format.

- From the FAQ

* faq.rst: Moved the comment in bunch section to datasets index

This comment has been moved to the datasets index in the external_datasets section:
Note: if you manage your own numerical data it is recommended to use an optimized file format such as HDF5 to reduce data load times. Various libraries such as H5Py, PyTables and pandas provides a Python interface for reading and writing data in that format.

* Update index.rst

Included all changes mentioned by @amueller and @jnothman

* Update faq.rst

* Update faq.rst
2016-10-08 21:10:31 +11:00
Josh Karnofsky 45cb11d97f [MRG+2] DOC add info to conventions for multi-label fitting (#7519)
* DOC add info to conventions for multi-label fitting

* DOC move to multilabel section and small edits

* DOC clean multilabel examples and clean information

* DOC fix line lengths for multiclass
2016-10-07 09:20:51 +11:00
Alexandre Abadie 93567dd270 [MRG+2] DOC: update persistence documentation with Joblib new behavior (#7434) 2016-09-19 09:56:31 +10:00
Raghav RV 9a12555e6d [MRG+1] ENH/MNT Rename labels --> groups in CV tools (#6660) 2016-09-11 19:14:41 +02:00
Andreas Mueller 6972d6c15c DOC minor doc fixes for sphinx. (#7357) 2016-09-08 10:07:40 +10:00
Raghav R V 4dbab2680e results_ --> cv_results_; "test_mean_score" --> "mean_test_score" et al. 2016-09-06 18:46:09 +02:00
Olivier Grisel 5daee9627d DOC fix iterated_power='auto' in doctests 2016-09-06 11:11:07 +02:00
Preston Parry 58b35d8b9f DOC Updates sklearn naming convention for consistency (#7268)
* Updates sklearn naming convention for consistency

* minor grammar fix

* clarifies source of string vs. function cosine
2016-08-29 08:20:13 +10:00
Yen 42120e50bb [MRG+1] Rename CV params n_{folds,iter} to n_splits (#7187)
* Rename n_iter to n_splits

* Fix bug

* Fix examples

* Add spaces

* Rename n_folds to n_splits

* Fix error

* Fix doc

* Fix doc

* Fix example

* Rename variables name

* PEP8

* Fix error message

* Add whats_new

* Fix test

* Fix doc

* Fix doc

* Make test clear
2016-08-16 13:56:55 -07:00
Jessica Yung c99aadad1e DOC Typo: consequective -> consecutive (#7171) 2016-08-10 21:37:20 +10:00
Óscar Nájera acef8cd671 Sphinx-doc absolute path for auto_example images 2016-08-03 20:23:50 +02:00
Óscar Nájera d6be865a32 References to examples 2016-08-03 20:23:50 +02:00
Óscar Nájera 7ec54472fd Add carousel
Fix reference link
2016-08-03 20:23:50 +02:00
Óscar Nájera 3d79f03199 update reference namespace in gallery scripts 2016-08-03 20:23:50 +02:00
Óscar Nájera bd5cecce44 update references link namespace 2016-08-03 20:23:50 +02:00
Óscar Nájera 04116ce286 update image sources namespace 2016-08-03 20:23:50 +02:00
Nate George 9b25f5d37a Fix docs links (#7005)
* docs: fix broken and redirect links

see #7000

* docs: fix links

see #7000

* docs: merge with master

* docs: fix fnrs and tinyclues logo links

* docs: fix link reference in text

* docs: fix typo

* docs: added back in metaoptimize-qa paragraph

* docs: update language for defunct site

* docs: update stackexchange section

* docs: remove defunct site, move quora to top

* docs: remove defunct link and rearrange links
2016-07-27 16:58:25 -04:00
Inki Hwang a2dac46e71 Fix minor typo in doc (#7001) 2016-07-16 08:39:10 +02:00
Rohan Jain 4a2bc34be2 DOC Fix text data tutorial (#6923)
- Fix a typo.
 - Fix a floating point error in doctests.
 - Fix `VisibleDepricationWarning` due to conversion of an array with
   ndim > 0 to an index.
 - Convert `print` to `log` to avoid doctests failure.

Fixes: #6927

Signed-off-by: Rohan Jain <crodjer@gmail.com>
2016-06-23 15:29:52 +10:00
Raghav R V afd5d18b0c [MRG] ENH Restructure grid_scores_ into a dict of 1D arrays
Also, DOC what's new section for model_selection changes
2016-06-16 12:23:04 +10:00
Robert Lutz 0c879ba551 [MRG+1] Fix: Replace pylab with matplotlib.pyplot #6754 (#6762)
* Fix: Replace pylab with matplotlib.pyplot #6754

 - one instance of 22 occurrences of pylab replaced with matplotlib.pyplot
 - bench_glm.py now free of pylab references
 - code executes properly

* Fix: Replace pylab with matplotlib.pyplot #6754

- one instance of 21 remaining occurrences of pylab replaced with
    matplotlib.pyplot
- bench_glmnet.py now free of pylab references
- code does not execute for extraneous reason: ImportError: No module named
    glmnet.elastic_net

* Fix: Replace pylab with matplotlib.pyplot #6754

- one instance of 19 occurrences of pylab replaced with matplotlib.pyplot
- bench_lasso.py now free of pylab references
- code executes properly

* Fix: Replace pylab with matplotlib.pyplot #6754

- one instance of 18 occurrences of pylab replaced with matplotlib.pyplot
- bench_plot_neighbors.py now free of pylab references
- code executes properly

* Fix: Replace pylab with matplotlib.pyplot #6754

- one instance of 17 occurrences of pylab replaced with matplotlib.pyplot
- bench_plot_omp_lars.py now free of pylab references
- code does not execute for extraneous reasons:
    - File "bench_plot_omp_lars.py", line 111, in <module>
    - ax = fig.add_subplot(1, 2, i)
    - ValueError: num must be 1 <= num <= 2, not 0
    - line 111 should probably be ax = fig.add_subplot(1, 2, i+1)

* Fix: Replace pylab with matplotlib.pyplot #6754

- bench_plot_parallel_pairwise.py now free of pylab references
- code executes properly

* Fix: Replace pylab with matplotlib.pyplot #6754

- bench_plot_ward.py now free of pylab references
- code executes properly

* Fix: Replace pylab with matplotlib.pyplot #6754

- bench_sgd_regression.py now free of pylab references
- code executes properly

* Fix: Replace pylab with matplotlib.pyplot #6754

- bench_tree.py now free of pylab references
- code executes properly

* refactor: Replace pl with plt

- replace instances of pl (as on import pylab as pl)
  with plt (as in import matplotlib.pyplot as plt)
- bench_glm.py clean

* refactor: Replace pl with plt

- replace instances of pl (as on import pylab as pl)
  with plt (as in import matplotlib.pyplot as plt)
- bench_glm.py clean of pl
- code does not execute for extraneous reasons

* refactor: Replace pl with plt

- replace instances of pl (as on import pylab as pl)
  with plt (as in import matplotlib.pyplot as plt)
- bench_lasso.py clean of pl
- code executes properly

* refactor: Replace pl with plt

- replace instances of pl (as on import pylab as pl)
  with plt (as in import matplotlib.pyplot as plt)
- bench_plot_neighbors.py clean of pl
- code executes properly

* refactor: Replace pl with plt

- replace instances of pl (as on import pylab as pl)
  with plt (as in import matplotlib.pyplot as plt)
- bench_plot_omp_lars.py clean of pl
- code does not execute for extraneous reasons

* fix: Fix bug that prevented graphs from displaying

* refactor: Replace pl with plt

- replace instances of pl (as on import pylab as pl)
  with plt (as in import matplotlib.pyplot as plt)
- bench_plot_parallel_pairwise.py clean of pl
- code executes properly

* refactor: Replace pl with plt

- replace instances of pl (as on import pylab as pl)
  with plt (as in import matplotlib.pyplot as plt)
- bench_plot_ward.py clean of pl
- code executes properly

* refactor: Replace pl with plt

- replace instances of pl (as on import pylab as pl)
  with plt (as in import matplotlib.pyplot as plt)
- bench_sgd_regression.py clean of pl
- code executes properly

* refactor: Replace pl with plt

- replace instances of pl (as on import pylab as pl)
  with plt (as in import matplotlib.pyplot as plt)
- bench_tree.py clean of pl
- code executes properly

* docs: removed pylab references from comments

* docs: removed all pylab references

- replaced with matplotlib.pyplot
- pl --> plt

* docs: removed pylab references from comments

- replaced with matplotlib.pyplot
- pl --> plt

* docs: removed all pylab references

- replaced with matplotlib.pyplot
- pl --> plt

* refactor: Replace pl with plt

- replace instances of pl (as on import pylab as pl)
  with plt (as in import matplotlib.pyplot as plt)
- mlcomp_sparse_document_classification.py clean of pl

* refactor: Replace pl with plt

- replace instances of pl (as on import pylab as pl)
  with plt (as in import matplotlib.pyplot as plt)
- plot_gpr_noisy_targets.py clean of pl
- code does not execute for extraneous reasons
  - File "examples/gaussian_process/plot_gpr_noisy_targets.py", line 31, in
      <module>
  - from sklearn.gaussian_process import GaussianProcessRegressor
  - ImportError: cannot import name GaussianProcessRegressor

* refactor: Replace pl with plt

- replace instances of pl (as on import pylab as pl)
  with plt (as in import matplotlib.pyplot as plt)
- plot_gpc_isoprobability.py clean of pl
- code does not execute for extraneous reasons
  - File "examples/gaussian_process/plot_gpc_isoprobability.py", line 24, in
      <module>
  - from sklearn.gaussian_process import GaussianProcessClassifier
  - ImportError: cannot import name GaussianProcessClassifier

* docs: removed all pylab references

- replaced with matplotlib.pyplot
- pl --> plt

* docs: removed all pylab references

- replaced with matplotlib.pyplot

* refactor: Replace pl with plt

- replace instances of pl (as on import pylab as pl)
  with plt (as in import matplotlib.pyplot as plt)
- plot_sparse_coding.py clean of pl
- code executes properly

* docs: removed all pylab references

- replaced with matplotlib.pyplot

* docs: removed all pylab references

- replaced with matplotlib.pyplot

* style: Indent properly

* style: indent properly

* style: Indent properly

* docs: Add missing .pyplot

* docs: Fix typo

* style: Indent properly
2016-05-10 11:34:33 +02:00
Andreas Mueller 7efeb5ab60 ENH added elkan k_means algorithm
renamed elkan -> triangle_inequality, lloyd-> full

pep8, rename _kmeans_single -> _kmeans_single_lloyd

add a docstring to elkans k-means in cython.

fixed text for full

Fixed elkans kmeans so that predict is same as labels

Added test to ensure full and triangle_inequality give same results

changed triangle_inequality to elkan

Addressed review comments

removed rebase artifacts

correct whats_new

moved enhancement bullet to 0.18

removed extra newline

strong typing dor prototype

fixed random state

removed c file

removed merge artifacts

removed entry from 0.17

Add documentation and inline_comments to _k_means_elkan.pyx

Minor rearrngement of docstring sentences

removed call to np.sort to improve speed for large number of clusters

replced logic with call to np.partition

Fallback to sort if partition does not exist

use partition from fixes rather than numpy
2016-04-05 19:57:19 -04:00
Rémy Léone 9b7176dd9d [DOC] Fix broken links 2016-03-23 12:45:34 -07:00
giorgiop 328ebfa865 ENH RandomizedPCA collapsed into PCA 2016-03-11 09:10:37 +11:00
YenChenLin ca4c727e22 Fix misuse of it's 2016-02-26 10:16:28 +08:00
YenChenLin 46fc1be145 Remove redundant words in sklearn 2016-02-23 16:54:03 +08:00
SmedbergM 765f77e2c4 Read web pages as UTF-8 by default. Use with-blocks to open files. 2016-02-16 16:14:42 +01:00
Nelson Liu fcfaa5fc37 Updated examples and tests that use scipy's lena
scipy.misc.lena will be removed in scipy version 0.17.
This changes the example to use scipy.misc.face instead.
2016-02-11 09:13:40 +01:00
Paul Strickland ef307ecf9c Correct typo in ``decomposition.rst``. Merge latest changes. 2016-02-06 14:47:11 +00:00
seales 0485ada58b General spelling fixes 2015-12-16 09:46:42 -08:00
Rémy Léone 4d2fe36252 dict.has_key() deprecated 2015-11-19 17:16:44 +01:00
Taranjeet 34f9367bbf grammatical fix in tutorial.rst under basic category 2015-11-07 23:09:27 +05:30
Rémy Léone f8eb351121 Useless trailing semicolon 2015-11-01 19:56:29 +01:00
Raghav R V f67e911124 DOC Modify documentation/examples for the new model_selection module 2015-10-29 16:49:23 +01:00
Andreas Mueller 6dd6f8ffe8 minor fixes to the doc build 2015-09-11 17:32:51 -04:00
TomDLT 94eb61960a ENH add sag solver in LogisticRegression and Ridge 2015-09-10 13:28:02 -04:00
Vighnesh Birodkar 2f099334f9 MAINT deprecate 1d input arrays for all estimators
Passing 1D arrays to check_array, without setting `ensure_2d` to false now
raises a deprecation warning before reshaping it. This will later throw an
error.

All Scaler classes also throw warnings when 1D arrays are passed.

All unit tests/doctests are modified to ensure that no 1D arrays are passed,
except in explicit 1D array tests where the warnings have been silenced.

Additional tests are also included which check for different 1D array cases.

2D array tests with one samples and one features are also added and where
they failed, `check_array` call has been modified to give a more useful error
message
2015-09-09 15:49:58 +02:00
Gael Varoquaux fb58d37846 Merge branch 'master' into pr_4009
Conflicts:
	sklearn/neighbors/ball_tree.c
	sklearn/neighbors/dist_metrics.c
	sklearn/neighbors/dist_metrics.pyx
	sklearn/neighbors/kd_tree.c
	sklearn/neighbors/tests/test_neighbors.py
2015-08-30 11:54:40 +01:00
Joel Nothman 99d08b571e DOC organise documentation hierarchy / table of contents 2015-06-12 08:09:41 +10:00
Lars Buitinck 567a956338 Merge branch 'pr/4714' + pep8 fixes
Conflicts:
	doc/modules/model_persistence.rst
	doc/modules/pipeline.rst
	doc/modules/svm.rst
	doc/tutorial/basic/tutorial.rst
	doc/tutorial/statistical_inference/supervised_learning.rst
	sklearn/svm/classes.py
2015-06-08 11:31:51 +02:00
Shivan Sornarajah 41788c353b Changed SVM to use gamma='auto' by default. Deprecated gamma=0.0. 2015-06-05 22:47:43 +01:00
Andreas Mueller 6d4bcda876 ENH refactor OVO decision function, use it in SVC for sklearn-like decision_function shape 2015-06-05 13:14:45 -04:00
Andreas Mueller 867da316ff DOC minor sphinx fixes 2015-06-04 16:29:19 -04:00
Christof Angermueller 0fe613ebab Add conventions section to userguide 2015-04-15 11:09:32 -04:00