Commit Graph

54 Commits

Author SHA1 Message Date
Maniteja Nandana 29ee54a586 Meta estimator for multi output classification 2016-04-01 07:18:59 +05:30
Tim Head 07cede74ca Multitarget regression meta estimator
Register OneVsRestRegressor as meta estimator

Rename to a more sensible name

Parallel predict and sparse support

Started MultiOutput documentation

Move code to new file multioutput.py

Continuing the move to new multioutput module

Added sample weight support

Better test for sample weights and actually support weights

Added a new test using weighted vs repeated samples to
test sample weight support. Uncovered that weights
were not actually passed on to underlying estimator.

Comment on multiprocess overheads

Move parallel_helper to utils.fixes

This helper works around a python2 limitation on pickling
instance methods

Example of multi-output regression with gradient boosting

Switch to uniform weighted score and updated example

The example now uses a RF with and without the MultiOutput
meta estimator

Added note for removing `score` method

Addressing comments on MultiOutputRegressor

MultiOutputregressor better test for weighted samples

Fix ups

Use explicit keyword argument for passing sample weights and
fix random_state on train-test split in the example
2016-03-10 16:06:08 -05:00
Andreas Mueller c55dc89902 Merge pull request #5695 from amueller/doc_fixes
[MRG] DOC some fixes to the doc build.
2015-11-03 15:24:56 -05:00
Andreas Mueller 2653833a07 DOC some fixes to the doc build. 2015-11-03 12:23:23 -05:00
Elvis DOHMATOB 56b51def64 DOC+ENH: RidgeClassifier doesn not support multi-label 2015-11-02 13:25:38 +01: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
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
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
Andreas Mueller 0650d5502e DOC adding backlinks to docstrings 2015-06-03 00:24:04 -04:00
Raghav R V e20d1a4391 ENH decision_function now returns #votes and scaled scores.
ENH use the decision_function to compute the prediction
TST Added test to assertain correlation of decision function and prediction
    Add test to check if ties are broken using decision function
    Add decision_function tests to check for votes/scores
    ovo_ties test will use decision function to calculate votes and score.
DOC Add entry to OvO's doc regarding how ties are broken
DOC Clean up the predict / decision_function methods' docstring.
PEP8 Minor PEP8 clean up.
2015-02-09 14:39:11 +05:30
MechCoder 89226b69b4 COSMIT: Made the following changes
1. Removed true from 'true multinomial loss'
2. Replaced OvA with OvR
3. Update whatsnew.rst
2014-08-21 17:37:38 +02:00
Hamzeh Alsalhi 9f45e3730f Modified sparse OvR to handle sparse target data
Defaulted label binarizer to set sparse_output=True when training ovr
classifiers, edited Label binarizer to allow for sparse binary column output
2014-07-18 12:10:50 +02:00
Olivier Grisel 2eb1e98eef MAINT ensure that examples figures are displayed in the correct order 2014-07-14 15:47:17 +02:00
Arnaud Joly ab1a784f0b FIX failing tests due to the change of the underlying sample generator 2014-07-08 12:21:55 +02:00
Lars Buitinck c176ced74d DOC double backticks for fixed-width (code) font
Fixes #3337. Also other minor fixes while I was at it.
2014-07-06 14:18:33 +02:00
Joel Nothman 255895d951 DOC remove mention of sequence of sequences in Parameters sections 2014-06-05 11:20:36 +02:00
Joel Nothman 18c399e20a MAINT deprecate sequences of sequences support
* add warnings
 * provide alternative binarizer, sklearn.preprocessing.MultiLabelBinarizer
 * fix documentation
2014-06-05 11:20:35 +02:00
Arnaud Joly 873a58c15e DOC not all functions support multilabel-sequence format 2013-12-02 11:32:41 +01:00
Lars Buitinck e8045759bf DOC: multiclass: make the warning more prominent
Too many newbies are asking questions involving a
OneVsRestClassifier(LinearSVC()) or similar construct
on the various forums.
2013-11-18 15:50:08 +01:00
Arnaud Joly eb068a7c42 DOC more comments from @NelleV 2013-07-28 10:54:15 +02:00
Arnaud Joly 886754bdc4 DOC ENH take into account @NelleV comments 2013-07-28 10:54:15 +02:00
Arnaud Joly 57ec891313 Typo 2013-07-28 10:54:15 +02:00
Arnaud Joly b79005a6d0 DOC rewording 2013-07-28 10:54:14 +02:00
Arnaud Joly 9ec7d052a8 DOC take into account @vene and @ogrisel + specify format for multioutput-multiclass 2013-07-28 10:54:14 +02:00
Arnaud Joly c1d766672f DOC overall improvements in the multiclass documentation 2013-07-28 10:54:14 +02:00
Yannick Schwartz 6e9498fd5f Update multiclass/multilabel documentation
Added examples to multiclass/label definitions

Reformulation of multilabel classification definition; updated list of multiclass algorithms

Added pointers for label binarizer helpers

Changed n_labels to n_classes
2013-07-28 10:54:14 +02:00
Arnaud Joly f4eded634d DOC overall improvements
Typo

COSMIT remove debug print

DOC better docstring

Typo

Remove aborted examples

DOC fix numpy doc rendering

DOC fix the figure grid has been transposed

DOC precise which estimators

DOC polish example

DOC wording
2013-07-26 16:01:04 +02:00
Arnaud Joly 629483d736 DOC unveil that some estimators support multilabel classification and multioutput-multiclass classification 2013-07-26 15:57:36 +02:00
Arnaud Joly 2be42f0aa1 DOC more information about which classifier support multilabel 2013-07-26 15:57:35 +02:00
Jaques Grobler 8861833ec9 DOC spellfixes 2013-06-29 16:18:23 +03:00
Arnaud Joly 5bcf25fc2f ENH multilabel metrics: accuracy, Hamming, 0-1 loss 2013-03-02 20:41:34 +01:00
Olivier Grisel 7064b3e964 FIX: fixed random_state for heisen doctest failure in multiclass module 2012-12-14 10:13:51 +01:00
Gael Varoquaux 833fc05e09 COSMIT simplify a bit examples 2012-05-05 21:57:05 +02:00
Vlad Niculae 3885dd8ac3 FIX: doctests for scale_C, took some liberties 2012-05-05 21:57:05 +02:00
Alexandre Gramfort f0dc6116ad API: set scale_C to True by default in libsvm/liblinear models 2012-02-11 14:42:47 +01:00
Andreas Mueller 915cf0cf6b DOC multi-class narrative: added links to the references, made citation clickable 2012-01-16 18:00:36 +01:00
Andreas Mueller 207cc74659 DOC fixes in Multiclass docs. Didn't show correctly on web. 2012-01-16 17:48:34 +01:00
Vlad Niculae 6c6d9e3a0b DOC: add image to narrative doc 2011-12-21 16:51:10 +01:00
Vlad Niculae 42b47ac72b DOC: really add example to multiclass.rst 2011-12-21 16:47:18 +01:00
Vlad Niculae f2b282df6e DOC: add example to multiclass.rst 2011-12-21 16:42:39 +01:00
Vlad Niculae 9970fe2aa8 Add the samples generator to the references 2011-12-21 11:15:53 +01:00
Lars Buitinck f609c3510f DOC multilabel learning: note that it's experimental + @mueller's remark 2011-12-20 17:58:02 +01:00
Lars Buitinck 688d2dda48 DOC multilabel classification in narrative docs
Somewhat of a stub at present.
2011-10-27 15:59:33 +02:00
Fabian Pedregosa 4ddb27a2f4 Update changelog 2011-09-14 15:01:10 +02:00
Fabian Pedregosa ddf4b72109 Move project directory from scikits.learn to sklearn 2011-09-02 12:06:57 +02:00
Fabian Pedregosa 68f27e3790 Revert "Move project directory from scikits.learn to sklearn"
This reverts commit fd0d3b879d.
2011-09-02 12:03:18 +02:00
Fabian Pedregosa fd0d3b879d Move project directory from scikits.learn to sklearn 2011-09-02 11:38:24 +02:00
Mathieu Blondel 3bf31cadd5 Fix currentmodule. 2011-08-29 23:04:47 +09:00
Mathieu Blondel 10322957ab Fix doctest errors (hopefully!). 2011-08-29 22:51:55 +09:00