Commit Graph

80 Commits

Author SHA1 Message Date
Andreas Mueller 7be6c2ce0e FIX two more docstrings. Sorry. 2012-10-16 20:05:27 +01:00
Andreas Mueller 51b06b8203 FIX doctests for max_iter 2012-10-16 16:46:48 +02:00
James Bergstra 5d6540d054 ENH: renaming iter_limit -> max_iter 2012-10-16 16:13:00 +02:00
James Bergstra 812376955a ENH: adding iter_limit to libsvm
This commit adds support for a new libsvm parameter, which permits setting a
hard limit on the while loop in the svm.cpp file, in the Solver::Solve
function. Without this functionality, it has been observed that libsvm hangs
without converging in a reasonable time -- it can take days instead of
seconds, and perhaps it is in fact an infinite loop, I don't know.  This
commit allows the user to set a hard limit on the number of libsvm iterations,
and modifies the libsvm bindings to raise a new exception of SolverTimeout
when this limit is reached.
2012-10-16 16:13:00 +02:00
Lars Buitinck dc943722de COSMIT refactor linear classifiers
Factored out the common code to LinearSVC, LogisticRegression, Perceptron
and SGDClassifier into a LinearClassifierMixin.
2012-09-17 21:06:36 +02:00
Francois Savard 7fb4fa359d Fixed docstring for C param in BaseLibLinear/SVM subclasses.
And added deprecation warning.
2012-08-22 16:05:14 -04:00
Lars Buitinck 4a579f842c BUG remove predict{_log,}_proba from SVR
Also, swapped predict_proba and predict_log_proba docstrings on SVC classes.
2012-07-21 02:20:33 +02:00
Andreas Mueller aa33e0e378 FIX more doctests that I broke. 2012-06-22 22:07:05 +02:00
Subhodeep Moitra 6592fdbee4 P3K: Fixing prints and dtypes 2012-05-11 11:24:27 +02:00
Alexandre Gramfort 15455263b7 API : change back default C to 1. explicitely and epsilon 0.1 2012-05-05 21:57:04 +02:00
Andreas Mueller 77954f292e FIXed many tests 2012-05-05 21:57:04 +02:00
Andreas Mueller 66d00f4748 MISC trying to remove scale_C 2012-05-05 21:57:04 +02:00
David Warde-Farley f4025567c9 Added RST comment about where to find narrative docs. 2012-04-18 19:06:05 -04:00
David Warde-Farley 40745ce455 Rephrased narrative doc reference in docstring. 2012-04-18 18:10:23 -04:00
David Warde-Farley f2a7a7d123 Add pointer to kernel equations from SVC docstring. 2012-04-18 15:50:19 -04:00
Nicolas Pinto f172c7ef09 MISC: verbose should be int, not bool 2012-04-12 21:05:14 -04:00
Nicolas Pinto e003185fa9 ENH: add verbose option to LinearSVC 2012-04-12 16:27:02 -04:00
Nick Wilson c90a329080 Add verbose parameter to SVMs (fixes #250)
Add a verbose parameter to SVMs to get verbose output from libsvm
printed to stdout while fitting a model.

Note that this setting takes advantage of a per-process runtime setting
in libsvm that, if enabled, may not work properly in a multithreaded
context.
2012-03-15 00:16:06 -07:00
Nick Wilson 0321ded656 Stop passing keyword arguments for positional args
The base SVM class constructors take positional arguments, but some of
their subclasses were passing some of the arguments in as keyword
arguments.
2012-03-14 23:15:54 -07:00
Olivier Grisel 7cf907b889 trailing whitespace 2012-03-10 11:50:26 -08:00
Alexandre Gramfort 1caad7d571 ENH : adding scaled_C_ attribute 2012-03-07 15:34:24 +01:00
Alexandre Gramfort c920fd8186 API: use C=None by default in libsvm/liblinear bindings so (C=1, scale_C=False) which is libsvm default == (C=None, scale_C=True) which is the scikit default 2012-03-07 15:34:24 +01:00
Andreas Mueller 88085f0408 DOC crammer_singer docstring by @ogrisel 2012-03-04 13:41:30 +01:00
Andreas Mueller 1a46df134a COSMIT typo. thanks @ogrisel. 2012-03-04 13:36:58 +01:00
Andreas Mueller 06e726c542 MISC changed parameter name back but changed semantics, as @mbondel suggested. 2012-03-04 12:50:35 +01:00
Andreas Mueller 139283ef62 ENH rename parameter "multi_class" of LinearSVC to "crammer_singer", add docs, add tests 2012-03-03 22:07:30 +01:00
Andreas Mueller 868eac134f Merge branch 'master' into svm_class_weights
Conflicts:
	doc/modules/svm.rst
	doc/tutorial.rst
	doc/whats_new.rst
	sklearn/linear_model/logistic.py
	sklearn/svm/base.py
	sklearn/svm/classes.py
	sklearn/svm/sparse/classes.py
	sklearn/svm/tests/test_sparse.py
	sklearn/svm/tests/test_svm.py
2012-02-15 00:12:02 +01:00
Olivier Grisel ba7f9a031d typo 2012-02-14 15:59:44 +01:00
Olivier Grisel 1be8865ca9 DOC: improved SVM docstrings 2012-02-14 10:00:07 +01:00
Alexandre Gramfort 7441db89ce update docstring with WARNING 2012-02-11 14:55:20 +01:00
Alexandre Gramfort 366ceb2d84 DOC: update scale_C docstrings + add notes to svm.rst 2012-02-11 14:43:45 +01:00
Alexandre Gramfort d41768a95c DOC : add warning in docstrings for scale_C gone in 0.12 2012-02-11 14:43:45 +01: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 c38565591c pep8 2012-02-09 20:53:37 +01:00
Andreas Mueller 16727b4105 MISC cleanup 2012-02-08 23:14:44 +01:00
Andreas Mueller 0e8312312b ENH: moved class_weight parameter in svms from fit to ``__init__``. 2012-02-07 00:24:02 +01:00
Andreas Mueller aa3a161087 COSMIT pep8 2012-02-01 22:32:17 +01:00
Mathieu Blondel 8e686beb9b Don't raise warning when passing explicit scale_C=False. 2012-02-01 20:24:03 +09:00
Andreas Mueller e786ac53cc Merge branch 'master' into svm_coef_sign
Conflicts:
	sklearn/svm/base.py
	sklearn/svm/liblinear.c
	sklearn/svm/sparse/base.py
2012-01-28 14:35:30 +01:00
Lars Buitinck 41ba56fdb2 ENH merge sparse and dense SVMs, part 3: adapt sparse tests 2012-01-27 17:41:25 +01:00
Lars Buitinck 72707abf3f ENH merge sparse and dense SVMs, part 2
* keep sparse.* behavior: will transform dense data into sparse data
  when fitting (we might want to deprecate this along with the classes)
* document sparsity support in classes.py
2012-01-27 17:41:25 +01:00
Lars Buitinck bc6255e8e7 ENH merge sparse and dense SVMs, part 1
* enable sparse matrix support in formerly dense versions
* remove DenseBaseLibSVM
* move sparse.libsvm to libsvm_sparse
2012-01-27 17:41:22 +01:00
Mathieu Blondel 77d83b61f9 Remove CoefSelectTransformerMixin and use SelectorMixin instead.
This fixes issue #518.
2012-01-25 18:04:27 +09:00
Lars Buitinck 9b0fbab0d1 ENH merge dense/sparse LinearSVC, part 3: deprecate sparse.LinearSVC 2012-01-16 18:27:14 +01:00
Andreas Mueller 3a129767b2 DOC layout of dual_coef_ in 1vs1 svm in user guide, example 2012-01-15 18:18:21 +01:00
Andreas Mueller 60a5053b3c DOC try to document layout of dual_coef_ in multiclass libsvm 2012-01-13 23:02:26 +01:00
Andreas Mueller 3e4b6df17e DOC external references go under "references" not "see also". "See also" can only handle internal references 2012-01-08 21:50:49 +01:00
Andreas Mueller 35c1222ebf DOCs workaround for docutils bug (column alignment problem) 2012-01-08 21:20:24 +01:00
Lars Buitinck 6e250d3f1c DOC cosmetics in SVM docstring 2012-01-08 14:55:59 +01:00
Olivier Grisel 436fcbe08c document the fact that coef_ is readonly for LogisticRegression and LinearSVC 2012-01-07 18:13:43 +01:00