Commit Graph

90 Commits

Author SHA1 Message Date
Andreas Mueller 952ef6637a MRG Drop legacy python / remove six dependencies (#12639) 2019-01-03 15:50:05 +02:00
TakingItCasual f4e7d2b19a Converting http to https (3)... (#12302) 2018-10-05 18:50:31 +02:00
jeremiedbb 9d649c5e5b DOC Clean up datasets loaders as part of the reorganization of the dataset section (#11319)
Standardize the datasets informations, as part of a more general reorganization of the dataset section in user guide, see #11083.

Fixes #10555
2018-07-25 23:52:02 +10:00
Nicolas Hug 72b2ed9ee1 DOC Added docstring checks for dataset module (#11407) 2018-07-24 10:57:13 +10:00
Hanmin Qin 399f1b2761
FIX Correct iris dataset (#11082) 2018-05-22 12:56:57 +08:00
Adam Richie-Halford 3b037b0e28 [MRG+1] Reference glossary in random_state docstring entries in datasets module (#10732)
* Reference glossary in random_state docstring entries in datasets module

* Add note about reproducibility to random_state docstring entries

* Fix default value in random_state docstring entries

* Revert fix of flake8 'line too long' error. Deemed off topic for this PR

* Remove surrounding spaces from equals sign in docstrings

* Change all '`random_state <Glossary>`' to '`Glossary <random_state>`'
2018-03-25 09:54:30 +11:00
tarcusx 8585275120 FIX Fixed a wrong data entry at boston_house_prices.csv (#10795) 2018-03-13 11:31:18 +08:00
jotasi afe540c7f2 Add deprecated scipy image-related functions in externals._pilutil (#10427) 2018-01-18 14:27:59 +01:00
Joel Nothman c3bdc0a89a
DOC clean up assorted type specifications (#10441) 2018-01-11 09:11:17 +11:00
Mohamed Maskani 7182a43a6f [MRG+1] Take over PR #7647 - Add a "filename" attribute to datasets that have a CSV file (#9101)
* add filename attribute for load_iris

* add filename attribute for load_boston

* add filename attribute for load_linnerud
2017-12-04 15:20:21 +01:00
Joan Massich c1eee276fa ENH: dataset-fetching with use figshare and checksum (#9240) 2017-08-03 18:50:30 +02:00
(Venkat) Raghav, Rajagopalan b6f8865b0a [MRG + 1 (rv) + 1 (alex) + 1] Add a check to test the docstring params and their order (#9206)
* add automatic test of docstrings for function / method signatures using numpydoc
2017-07-11 18:42:10 +02:00
JC Liu 0bdd8bfb2b Add ref (#9064)
* Add ref

* Fix pep8
2017-06-09 13:18:25 +02:00
Hanmin Qin 098fd31ce2 [MRG+1] DOC use a table in load_linnerud docstring (#8970) 2017-06-01 14:32:59 +02:00
jaroslaw-weber c2b0de59aa [MRG+1] added DESCR attribute in diabetes data (#8840)
*  added DESCR attribute in diabetes data

*  added DESCR attribute in diabetes data (fix flake8)

*  added DESCR attribute in diabetes data (added test)
2017-05-08 10:02:38 +02:00
RAKOTOARISON Herilalaina fb5a498d0b [MRG+1] Change named_steps to Bunch object (#8586)
* Change named_steps to Bunch object

* Update named_steps attribute documentation

* Add test for named steps bunch object

* Delete whitespace in test_pipeline

* Update test_pipeline.py

* Add comment for named_steps usage

* Move dataset/Bunch to utils

* Fix to PEP8 format

* Add __getattribute method to Bunch class, Fix pep8 bug

* Remove __getattribute__, update test_pipeline

* Update test with conflict and non-conflict named_steps

* Add reference to class Pipeline
2017-03-30 14:21:51 +02:00
Tyler Lanigan eb9fe80e50 DOC add example regarding feature scaling (#7912)
also add load_wine to datasets
2017-02-14 00:27:19 +11:00
Joel Nothman 8570622a44 [MRG+1] DOC insert spaces before colons in parameter lists (#7920)
* DOC insert spaces before colons in parameter lists

Complies with numpydoc to improve rendering and automatic quality
assurance such as #7793. Affects listings of Parameters Attributes,
Returns.

Performed with the help of:

    grep -nE '^(    )+[a-zA-Z][a-zA-Z0-9_]*: ' sklearn -R | grep -v -e
    externals -e tests | grep -v -e default: -e else: -e Warning: -e Note:
    -e TRAIN: -e Default: -e True: -e False: -e DOI: -e In: | gsed
    's|\([^:]*\):\([0-9]*\):\([^:]*\):\(.*\)|--- a/\1\n+++ b/\1\n@@ -\2,1
    +\2,1 @@\n-\3:\4\n+\3 :\4|' | git apply --unidiff-zero -

* DOC fix numpydoc format for param
2016-11-25 10:59:22 +01:00
rickiepark 3953a9a14f add feature_name to diabetes dataset (#4477) 2016-09-29 17:22:16 +09:00
Manvendra Singh 8994d0ef61 [MRG+1] added return_X_y option to toy datasets in sklearn.datasets (#7154)
* added return_X_y support to more dataset loaders

* fix typo

* updated whats_new.rst

* fix indentation for version added tag

* call astype before the branching

* better formatting in whats_new.rst

* better formatting

* updated what's new
2016-08-07 15:07:07 +02:00
Manvendra Singh c98adf7d58 [MRG] load_breast_cancer dataset: added return_X_y option (#7152)
* added return_X_y option to breast_cancer_dataset, tests included

* fix typo

* update whats_new

* removed extra space

* improved whats_new changelog
2016-08-06 11:52:23 +02:00
Nelson Liu 1b6c84da13 fix indent in whats_new and fix indent in datasets/base.py (#7138) 2016-08-04 13:22:14 -04:00
Manvendra Singh b8be0198b6 [MRG + 1] load_iris dataset: added return_X_y option (#7049)
* load_iris dataset:added return_X_y option

* Updated return type description

* improved return type description

* Removed extra line

* Added extra line

* Added test sentence.

* Remove sample text

* Fixes

* pep8

* Added version tag

* added entry in whats_new

* fixed extra space
2016-07-29 14:31:36 -04:00
Alexandre Gramfort d8290914d5 pep8 2016-07-27 10:37:12 +02:00
Andreas Mueller e2bc2a756d add __dir__ to bunch for better autocomplete (#7090) 2016-07-27 10:36:36 +02:00
Andreas Mueller 8972d82a1f DOCS / COSMIT duplicate word typos 2016-07-26 10:44:32 -04: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
Loïc Estève ae70c555ce Fix reading of bunch pickles
that have been generated with scikit-learn < 0.17
2016-01-26 15:16:01 +01:00
Loïc Estève f63ba1d963 MAINT use super rather than calls to base class methods 2015-10-22 15:00:43 +02:00
Raghav R V a87011262a FIX precision to float64 across the codebase 2015-10-16 11:20:29 +02:00
Olivier Grisel 69831da6bd ENH utility to have distinct dataset .pkl filenames 2015-10-07 15:05:39 +02:00
Ishank Gulati c8406fbfcb Breast cancer dataset added 2015-10-01 16:47:01 -04:00
Andreas Mueller 0650d5502e DOC adding backlinks to docstrings 2015-06-03 00:24:04 -04:00
jfraj e4b9ff6c98 Adding test to ensure bunch consistency after pickle
Updated Bunch getattr definition to raise the appropriate error
(should raise Attribute error not KeyError)

See issue #4600
2015-04-16 18:25:13 -04:00
jfraj 4161d5570e Improving Bunch Class to ensure consistent attributes
Adding set/getattr methods that fill/query the same thing as `bunch[key]`.

Add test for a non-regression bug in fetch_20newsgroups.
2015-04-15 19:04:47 -04:00
Andreas Mueller c970fb51e7 COSMIT spelling 2015-01-15 15:09:35 -05:00
Raghav R V 88555987cc PEP8 Fix E101, E111 errors and W191, W293, W293 and W391 warnings. 2015-01-08 04:28:24 +05:30
Calvin Giles dd9e512ddb Changed f=open() to with open() as f to eliminate ResourceWarnings. Fixes #3410. 2014-08-31 14:44:11 +01:00
Lars Buitinck 56057c9630 MAINT remove deprecated code 2014-07-23 16:19:40 +02:00
Lars Buitinck cc2eb2344c FIX wrong parameter name in deprecation warning 2014-06-08 14:26:56 +02:00
murad ba352bfd06 open iris files with statement to avoid ResourceWarning 2014-04-16 15:23:58 -04:00
James Yu 71cba016ab typo 2014-03-17 15:35:41 -05:00
Michael Hanke 4c370a7357 BF: load_boston() return 13 features, but 14 feature names
Last column has the target value, hence only report first 13 names.
2014-02-17 15:24:35 +01:00
Erik Shilts b0abd2f75a DOC Remove target_names from boston dataset object description 2014-01-02 11:34:47 -08:00
Lars Buitinck 00871e3788 DOC typo 2013-08-10 12:47:13 +02:00
Nelle Varoquaux 0498af7d31 DOC better deprecation warning messages.
The charset parameter has been replaced by encoding and the charset_error by
decode_error.
2013-07-26 10:14:45 +02:00
Nelle Varoquaux 88fd230439 MAINT charset is deprecated in favor of encoding
closes #2107
2013-07-26 09:30:58 +02:00
Lars Buitinck 41b1f9a909 FIX charset -> encoding in load_files
Removed the deprecation of charse_error; this isn't going to be pickled
anyway. Renamed charset_error to decode_error, which I think is more
suggestive of its meaning than encoding_error.
2013-07-04 13:12:58 +02:00
Lars Buitinck 78a80cecb9 Revert "FIX charset -> encoding in load_files"
This reverts commit ed204ea96d.

This shouldn't have been on master yet, see #2128.
2013-07-03 15:00:52 +02:00
Lars Buitinck ed204ea96d FIX charset -> encoding in load_files
Removed the deprecation of charse_error; this isn't going to be pickled
anyway. Renamed charset_error to decode_error, which I think is more
suggestive of its meaning than encoding_error.
2013-07-03 13:46:11 +02:00