Commit Graph

104 Commits

Author SHA1 Message Date
practicalswift 549474de2e [gardening] Fix NameError ("estimator" not defined). Remove unused var "ind". 2016-03-20 22:48:25 +01:00
Gael Varoquaux 49330b6fa7 COSMIT: whitespace
To finish off #6087
2016-01-10 11:01:05 +01:00
kaichogami bd9716913e Made few tweaks based on commemnts
changed docstring of partial_fit, added check_classification_target in ovo, removed classes parameter in _partial_fit_binary.
2016-01-10 02:18:00 +05:30
kaichogami 604d54c348 Changed izip import statement, importing from six moudle 2016-01-08 00:49:27 +05:30
kaichogami 13016925af Removed joblib comment, made compatible for python3
Removed the outdated comment about joblib overahead of thread spawining issue. Made izip compatible for both python2 and python3.
2016-01-03 15:50:29 +05:30
kaichogami cdb9dba63e Added doc, tests
Added test for partial_fit when mini-batch doesn't have all target classes. Changed doc for better explaination of the use of  paramter in partial_fit method. Used generator for passing of classes in OvO in Parallel processing instead of estimator.pop().
2016-01-02 20:20:09 +05:30
kaichogami fb3574d719 Added partial_fit method for ovo and ovr
FIX issue #4167 implementing online learning where base estimators have patial_fit method.
2016-01-01 13:18:18 +05:30
Raghav R V 7e29af034b MAINT remove deprecated stuff that will no longer be supported in 0.18 2015-10-19 10:44:42 +02: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
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 0650d5502e DOC adding backlinks to docstrings 2015-06-03 00:24:04 -04:00
Andreas Mueller b9d8fd56a2 ENH support for sparse coef_ in ovr classifier 2015-05-15 20:26:38 -04:00
Andreas Mueller d89c215013 Add tags to classifiers and regressors to identify them as such. 2015-03-31 19:59:49 -04:00
Raghav R V 342e6e40bc COSMIT remove trailing whitespaces 2015-03-06 22:41:04 +05:30
Raghav R V b74b004d71 ENH Scale the sum_of_confidences to (-0.5, 0.5) 2015-03-06 22:41:04 +05:30
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
Kyle Beauchamp c2d2307391 Added feature to fix #1523 2015-02-09 14:39:11 +05:30
Raghav R V abd31d2cad MAINT Make uniform the error raised for not fitted condition 2015-01-12 00:33:40 +05:30
Javier López Peña 744614dfba Check if targets is a numpy array and convert it into one if it isn't 2014-11-30 11:26:38 +00:00
Mathieu Blondel b15df0d4aa Typo 2014-11-26 22:53:22 +09:00
Lars Buitinck b584ac47be FIX ovr predict_proba in the binary case
Previous commit fixed the shape, but swapped the actual probabilities.
2014-09-29 22:51:19 +02:00
Will Lamond 6e123c0661 Fixes ovr in the binary classifier case, and adds support for lists of feature arrays in the multiclass case. 2014-09-26 21:31:41 -04:00
Joel Nothman b3bdb08964 DOC fix formatting of attributes etc. in docstrings 2014-07-28 19:04:59 +10:00
Vlad Niculae 77c6c602ec FIX classes name in OvR 2014-07-21 00:31:38 +02:00
Gael Varoquaux 4ec86301e2 Merge pull request #3444 from arjoly/explain-default-score
[MRG+1] ENH + DOC set a default scorer in the multiclass module
2014-07-19 16:01:16 +02:00
Arnaud Joly 16870ffd46 ENH + DOC set a default scorer in the multiclass module 2014-07-19 15:13:23 +02:00
Arnaud Joly 0807e19dc2 MAINT deprecate fit_ovr, fit_ovo, fit_ecoc, predict_ovr, predict_ovo, predict_ecoc and predict_proba_ovr 2014-07-19 12:17:22 +02:00
Andreas Mueller eb2098f26f Closes #2360. Fix tiebreaking. 2014-07-18 16:48:08 +02:00
Vlad Niculae caff874850 DOC fix docstrings; add @hamsal to authors 2014-07-18 12:36:18 +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
Joel Nothman 51d4f75d06 FIX case where label is constantly absent 2014-06-23 11:53:46 -04:00
Joel Nothman fa76ac38ee FIX OvR with constant label for non-predict methods 2014-06-23 10:52:01 -04:00
Joel Nothman fc0150d08d DOC/FIX Address @arjoly's comments 2014-06-05 11:20:36 +02:00
Joel Nothman 255895d951 DOC remove mention of sequence of sequences in Parameters sections 2014-06-05 11:20:36 +02:00
Lars Buitinck 95619a961f DOC multiclass: OvO needs predict_proba or decision_function
Fixes #3183.
2014-05-23 11:41:38 +02:00
Gael Varoquaux fedff321ce COSMIT: simplify code 2013-12-19 07:47:36 +01:00
Gael Varoquaux 3ee7b72426 BUG: OneVsOneClassifier was broken with string labels 2013-12-18 22:51:22 +01:00
Olivier Grisel e81b9f68a5 Avoid raising a deprecation warning on label_binarizer_.multilabel_ 2013-07-25 10:21:25 +02:00
Gael Varoquaux d504675d6f PEP8 2013-07-22 12:56:05 +02:00
Kyle Kastner 2d6093a83c Inlined extraneous function call from decision_function and added a check that the base estimator has a decision_function attribute 2013-07-22 12:56:05 +02:00
Kyle Kastner 784486126f Cleaned up tests, and removed unused multilabel parameter in decision_function_ovr 2013-07-22 12:56:05 +02:00
Kyle Kastner 5088875a0c Updated fixes for #2012. 2013-07-22 12:56:05 +02:00
Kyle Kastner cbd65449c0 Added decision_function support to OneVsRestClassifier and a test, test_ovr_single_label_decision_function, in test_multiclass.py 2013-07-22 12:56:05 +02:00
Nelle Varoquaux 60b66a2bcc DOC fixed some formatting in the multiclass module 2013-07-10 12:26:12 +02:00
Felix Brockherde 34022b5283 FIX scores calculation in ovo multiclass
Verify that ties can be won by all labels
2013-05-04 10:33:49 +02:00
Robert Layton dacfd8bd5d DOC: Replaced all BSD style licenses with "BSD 3 clause"
Replaced all BSD style licenses with "BSD 3 clause"
Not checked yet!

Removed duplicate "3 clause, 3 clause"

Removed trailing period if exists

Fixed some missed licences, still about 50 to do, but those can be automated

Think I got the last of them.

Apparently me and sed have different ideas of regex.

Found a few more
2013-04-30 08:34:46 +02:00
Lars Buitinck e1f5f42144 DOC multiclass: typo and use case
Questions keep popping up on SO from users who needlessly use
sklearn.multiclass, e.g. building OneVsRestClassifier(LinearSVC()) models.
2013-04-18 15:28:05 +02:00
Mathieu Blondel fcf69bdaf8 Cosmit: remove needless blank lines. 2013-03-24 11:54:43 +09:00
Lars Buitinck 645216fb2f Merge pull request #1524 from amueller/break_ovo_ties
MRG break ties in OvO using scores
2013-02-14 06:15:32 -08:00
Olivier Grisel 1967a0b323 P3K use six to have a python 2 & 3 compatible code base 2013-02-09 18:08:44 +01:00