Commit Graph

64 Commits

Author SHA1 Message Date
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
Andreas Mueller 254e15fa55 ENH fix error by removing unnecessary test. 2012-09-03 11:02:14 +02:00
Nelle Varoquaux 4631a2192b FIX sparse OneClassSVM was using the wrong parameter 2012-09-02 20:47:46 +02:00
Nelle Varoquaux 5954727b49 Deprecated sparse classes from the SVM module - refs #1093 2012-09-02 20:45:56 +02:00
Vlad Niculae 9e7c03f71a Add or fix deprecation schedule in warnings. 2012-09-01 20:02:14 +02: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 ee7d78ce47 Make sparse svm base class ABC 2012-06-26 14:16:04 +02:00
Andreas Mueller aa33e0e378 FIX more doctests that I broke. 2012-06-22 22:07:05 +02:00
Andreas Mueller 4e7d9962f6 ENH fixed doctests, addressed comments. 2012-06-15 19:31:47 +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
Lars Buitinck cb76a77d5f BUG fix issue #753, "Sparse OneClassSVM missing argument to super()"
Only affects backwards compat version in sklearn.svm.sparse.
2012-04-04 11:50:56 +02: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
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 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
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 0e8312312b ENH: moved class_weight parameter in svms from fit to ``__init__``. 2012-02-07 00:24:02 +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
Andreas Mueller 5c2a8696e3 COSMIT removed unused imports 2012-01-23 21:13:55 +01:00
GaelVaroquaux 24477d4109 Cosmit: remove unused imports 2012-01-23 18:19:32 +01:00
Lars Buitinck 9b0fbab0d1 ENH merge dense/sparse LinearSVC, part 3: deprecate sparse.LinearSVC 2012-01-16 18:27:14 +01:00
Lars Buitinck a9470d12ca ENH merge dense/sparse LinearSVC, part 2: no more sparse.CoefSelectTransformer 2012-01-16 18:05:40 +01:00
Lars Buitinck 263d6c02f7 ENH merge dense/sparse LinearSVC, part 1: no more SparseBaseLibLinear 2012-01-16 17:55:47 +01:00
Lars Buitinck a6e7178d20 COSMIT remove superfluous imports in svm/sparse/base.py 2012-01-08 22:17:21 +01:00
Andreas Mueller cd161e277d COSMIT "Optional Parameters" Section removed 2011-12-22 21:09:15 +01:00
Andreas Mueller 355a51c557 FIX: Section Returns not Return 2011-12-22 19:34:33 +01:00
Alexandre Gramfort db74b538e5 Merge remote-tracking branch 'origin/master' into n_samples_scaling
Conflicts:
	sklearn/svm/sparse/base.py
	sklearn/svm/tests/test_sparse.py
2011-12-18 12:45:58 +01:00
Alexandre Gramfort 8ec89a9fc2 ENH : C scaling of sparse models 2011-12-18 12:39:26 +01:00
Andreas Mueller 25c93f4af6 COSMIT: pep8 2011-12-15 17:24:53 +01:00
Alexandre Gramfort cfcf42e742 Merge branch 'master' into n_samples_scaling
Conflicts:
	doc/whats_new.rst
	sklearn/grid_search.py
	sklearn/svm/base.py
	sklearn/svm/classes.py
	sklearn/svm/sparse/classes.py
2011-12-15 15:17:46 +01:00
Gilles Louppe b25c574b76 DOC: Standardized the module documentation format (2) 2011-11-30 11:05:10 +01:00
Peter Prettenhofer bb5ddcbaac fix: rm `nu` argument from sparse.SVR (taken from dense SVR). 2011-11-22 22:10:08 +01:00
Mathieu Blondel 16f628e827 Revert "FIX : removing param nu from sparse.SVR, C from NuSVR + pep8"
This reverts commit ad9f7b5a64.

Conflicts:

	sklearn/svm/classes.py
	sklearn/svm/sparse/classes.py
2011-11-22 14:50:27 +09:00
Lars Buitinck fee7e8a2d9 FIX use super consistently in SVMs 2011-11-15 23:46:36 +01:00
Alexandre Gramfort fdbd584a93 s/C_scale_n_samples/scale_C 2011-11-11 21:36:19 -05:00
Alexandre Gramfort 5504034f4a $Merge branch 'master' into n_samples_scaling
Conflicts:
	sklearn/svm/classes.py
	sklearn/svm/sparse/classes.py
2011-11-11 21:22:17 -05:00
Alexandre Gramfort ad9f7b5a64 FIX : removing param nu from sparse.SVR, C from NuSVR + pep8 2011-11-11 21:15:59 -05:00
Alexandre Gramfort 6def64c3e6 ENH : adding support for scaling by n_samples of the C parameter in libsvm and liblinear models 2011-11-11 16:43:03 -05:00
Fabian Pedregosa 09677e0193 FIX: do not use reshape in libsvm sparse bindings.
This should fix issues of people using this in parallel.
2011-11-07 15:05:37 +01:00
Andy bdc69b6200 DOC: fogot doctests in python files. 2011-11-04 14:35:18 +01:00
Andy 07b4121ea3 BUG: minor mistake in earlier commit. 2011-11-04 14:34:51 +01:00
Andy 8878ebe9da ENH Sparse SVM: removed cache_size parameter from fit method. Is now part of constructur. 2011-11-04 13:34:54 +01:00
Andy 4e746501ea ENH: SVM cache_size default value changed to 200 mb 2011-11-04 13:34:20 +01:00
Andy d961d79d52 BUG: cache_size also for sparse SVMs 2011-11-03 17:28:43 +01:00