change the kernel parameters to be the same as libsvm in scikit inter…

…face
Xtra-Computing · Jul 3, 2018 · 82443c0 · 82443c0
1 parent 0b4648e
commit 82443c0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/python/README.md b/python/README.md
@@ -69,13 +69,13 @@ class SVR(kernel = 2, degree = 3, gamma = 'auto', coef0 = 0.0, C = 1.0, epsilon
 
 
 ### Parameters
-*kernel*: int, optional(default=2)\
+*kernel*: string, optional(default='rbf')\
     set type of kernel function\
-                    	0 -- linear: u'\*v\
-                    	1 -- polynomial: (gamma\*u'\*v + coef0)^degree\
-                    	2 -- radial basis function: exp(-gamma\*|u-v|^2)\
-                    	3 -- sigmoid: tanh(gamma\*u'\*v + coef0)\
-                    	4 -- precomputed kernel (kernel values in training_set_file)
+                    	'linear': u'\*v\
+                    	'polynomial': (gamma\*u'\*v + coef0)^degree\
+                    	'rbf': exp(-gamma\*|u-v|^2)\
+                    	'sigmoid': tanh(gamma\*u'\*v + coef0)\
+                    	'precomputed' -- precomputed kernel (kernel values in training_set_file)
 
 *degree*: int, optional(default=3)\
     set degree in kernel function

diff --git a/python/thundersvmScikit.py b/python/thundersvmScikit.py
@@ -45,6 +45,7 @@
     exit()
 
 SVM_TYPE = ['c_svc', 'nu_svc', 'one_class', 'epsilon_svr', 'nu_svr']
+KERNEL_TYPE = ['linear', 'polynomial', 'rbf', 'sigmoid', 'precomputed']
 
 class SvmModel(ThundersvmBase):
     def __init__(self, kernel, degree,
@@ -92,7 +93,7 @@ def fit(self, X, y):
         else:
             self._gamma = self.gamma
 
-        kernel = self.kernel
+        kernel = KERNEL_TYPE.index(self.kernel)
 
         fit = self._sparse_fit if self._sparse else self._dense_fit
         self.model = thundersvm.model_new(solver_type)