Commit Graph

2221 Commits

Author SHA1 Message Date
Vinayak Mehta 0de583acb0 Fixed LDA typo in doc 2015-09-14 21:50:27 +05:30
Olivier Grisel 0bc3a6fbca Merge pull request #5245 from ogrisel/lda-acronym-deprecation
[MRG+1] Deprecate LDA/QDA in favor of expanded names
2015-09-14 13:35:06 +02:00
Andreas Mueller 6dd6f8ffe8 minor fixes to the doc build 2015-09-11 17:32:51 -04:00
Vinayak Mehta 679936f6bc MAINT Deprecate LDA/QDA in favor of expanded names
The LDA accronym for Linear Discriminant Analysis is ambiguous
because of the newly introduced Latent Dirichlet Allocation model.

We therefore deprecate the sklearn.lda.LDA and sklearn.lda.QDA
in favor of explicit names.
2015-09-11 15:32:11 +02: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
Andreas Mueller 6f696cac53 Merge pull request #5218 from mooz/patch-1
Correct expectation notation in DP-GMM doc
2015-09-08 16:54:33 -04:00
Gilles Louppe c769a65e15 COSMIT: variable names, documentation, etc 2015-09-07 10:08:17 +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
Masafumi Oyamada cdaad2d3e0 Correct expectation notation in DP-GMM doc
Unify expectation notation to E_q[\log P(X_i|z_i=k)],
which is thoroughly used in the other part of the document
2015-09-07 11:34:05 +09:00
Andreas Mueller 96c329f463 Merge pull request #5037 from betatim/tree-feature-transform
[MRG+1] Trees as feature transformers
2015-08-31 11:43:49 -04:00
Gilles Louppe 337a6ba1b3 DOC: add cross_validation.LabelShuffleSplit to classes.rst 2015-08-30 12:05:15 +02:00
Brian McFee 21a966ae8a ENH: added LabelShuffleSplit cv iterator 2015-08-30 12:00:18 +02:00
Alexandre Gramfort 4170473800 Merge pull request #5131 from michigraber/nonnegative-lars
Nonnegative lars
2015-08-28 21:43:09 +02:00
Data1010 6248745c32 fix #5139 2015-08-26 15:43:52 -04:00
mhg 535536e537 merge with upstream/master 2015-08-25 14:07:56 +09:00
mhg 6b22d97011 positive option for Lars propagated to doc. 2015-08-18 15:24:16 +09:00
Lars edf077ccd6 Merge pull request #5050 from AnishShah/issue5043
DOC Fix documentation of callable kernel
2015-08-14 18:43:24 +02:00
Anish Shah a7081d797f [issue #5043] fix documentation of callable kernel 2015-08-14 15:40:03 +05:30
Kyler Brown 11cd969755 fixing a typo in feature extraction documentation 2015-08-13 09:13:13 -05:00
Tim Head 89ec72ea2f Example to demonstrate use of tree.apply() method
This example trains several tree based ensemble methods and uses
them to transform the data into a high dimensional, sparse space.
The trains a linear model on this new feature space. The idea is
taken from:

Practical Lessons from Predicting Clicks on Ads at Facebook Junfeng Pan,
He Xinran, Ou Jin, Tianbing XU, Bo Liu, Tao Xu, Yanxin Shi, Antoine
Atallah, Ralf Herbrich, Stuart Bowers, Joaquin Quiñonero Candela
International Workshop on Data Mining for Online Advertising (ADKDD)

https://www.facebook.com/publications/329190253909587/
2015-08-11 20:38:07 +02:00
Raghav R V 103f504734 DOC revert the documentation changes 2015-08-11 22:27:15 +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
Alexandre Gramfort 1a45b79bb5 typos 2015-08-09 21:22:00 +02:00
Lars a6c6e732c5 Merge pull request #3659 from chyikwei/onlineldavb
ENH Latent Dirichlet Allocation (LDA) with online variational Bayes
2015-08-09 19:13:01 +02:00
Lars Buitinck b09afb08be DOC/MAINT final touches to FunctionTransformer
* copyedit doc
* give the module an underscore (we should do this to all private modules...)
* use public import path in test
* change all logs to log1p to prevent warning in test and because it's
  genuinely useful for frequency data
* what's new
2015-08-03 22:12:19 +02:00
Andreas Mueller 9d14f7352e ENH: Renames CallableTransformer -> FunctionTransformer.
Makes `pass_y` an argument to FunctionTransformer to indicate that the
labels should be passed to the wrapped function.
2015-08-03 11:45:16 -04:00
Joe Jevnik cb0916c440 ENH: Adds CallableTransformer
CallableTransformer allows a user to convert a standard python callable
into a transformer for use in a Pipeline.
2015-08-03 11:45:16 -04:00
Andreas Mueller ef3a40457f Merge pull request #5052 from larsmans/kappa
[MRG + 1] add Cohen's kappa score to metrics
2015-07-31 12:16:22 -04:00
Andreas Mueller 9207639e57 DOC fixed short underline 2015-07-30 18:37:32 -04:00
SimonPL 8b7fa9eb34 Small edits to LDA/QDA documentation 2015-07-30 18:37:32 -04:00
SimonPL df14ef9a91 Rewrite of the documentation for LDA/QDA 2015-07-30 18:37:32 -04:00
Lars Buitinck b802ca2f1b ENH: add Cohen's kappa score to metrics 2015-07-30 17:27:48 +02:00
Andreas Mueller 0bcbf922e5 Merge pull request #4965 from mrphilroth/4922
[MRG+1] New k-means example
2015-07-29 11:20:27 -04:00
Phil Roth 253ae0edae Adding a reference to the example in the narrative documentation 2015-07-24 18:27:39 -04:00
Phil Roth 0d4770f812 Adding kmeans example to the narrative documentation 2015-07-24 10:40:21 -04:00
John Kirkham f73fe1010b DOC: Remove extra "not". [ci skip] 2015-07-23 16:23:10 -04:00
Louis Tiao 9f465313a8 Filled in missing negation
Since `make_union` is a convenience factory method that returns a `FeatureUnion` class with names automatically filled in and obviously does *not* require manual naming of the components.
2015-07-23 14:48:39 +10:00
Alexandre Gramfort 9593631eea Merge pull request #4933 from banilo/regr_score_docs
[MRG+1] extend R^2 description
2015-07-20 23:30:02 +02:00
TomDLT 81de81a01a ENH implement LYRL2004 train/test split of rcv1 2015-07-16 19:21:24 +02:00
Andreas Mueller 171f933de9 Merge pull request #4971 from dotsdl/issue-4724
[MRG+2] Added list of multi-label supporting classifiers.
2015-07-12 16:12:51 -05:00
Andreas Mueller 86388623be Merge pull request #4915 from untom/minmax_scale
[MRG+1] ENH add minmax_scale
2015-07-12 15:37:13 -05:00
David Dotson ef5312c60c Added list of multi-label supporting classifiers.
Closes #4724. The multi-class page now includes a list of estimators
that support multi-labels. Also adjusted the reference to LDA to include
QDA as a multiclass-supporting classifier.
2015-07-12 15:09:45 -05:00
banilo 3a82309d98 extend R^2 description 2015-07-12 01:25:52 +02:00
Theodore Vasiloudis 1cd4e7fcd8 [docs] [trivial] Fix small error in cross-validation docs.
In the cross-validation docs in the user guide, the StratifiedKFold example mentions 2-fold CV but actually uses 3. This fixes the text.
2015-07-07 12:46:41 +02:00
Thomas Unterthiner e7e22d1e55 DOC Improve wording in minmax_scale documentation 2015-07-05 18:51:55 +02:00
Thomas Unterthiner 0e5db844c6 Add missing scalers to classes.rst 2015-07-02 11:33:47 +02:00
Thomas Unterthiner 26fbfe6f2e ENH add minmax_scale 2015-07-01 23:27:35 +02:00
Chyi-Kwei Yau fdfb80886f improve LDA doc 2015-06-24 18:33:04 -04:00