[Scipy-svn] r2102 - trunk/Lib/sandbox/svm

[scipy-svn at scipy.org]

Author: fullung
Date: 2006-07-14 07:59:13 -0500 (Fri, 14 Jul 2006)
New Revision: 2102

Modified:
   trunk/Lib/sandbox/svm/classification.py
   trunk/Lib/sandbox/svm/dataset.py
   trunk/Lib/sandbox/svm/kernel.py
   trunk/Lib/sandbox/svm/libsvm.py
   trunk/Lib/sandbox/svm/model.py
   trunk/Lib/sandbox/svm/oneclass.py
   trunk/Lib/sandbox/svm/regression.py
Log:
Reformat code to conform to PEP 8.


Modified: trunk/Lib/sandbox/svm/classification.py
===================================================================
--- trunk/Lib/sandbox/svm/classification.py	2006-07-14 09:05:30 UTC (rev 2101)
+++ trunk/Lib/sandbox/svm/classification.py	2006-07-14 12:59:13 UTC (rev 2102)
@@ -1,3 +1,9 @@
+from ctypes import cast, POINTER, c_int, c_double
+import numpy as N
+
+from model import LibSvmModel
+import libsvm
+
 __all__ = [
     'LibSvmCClassificationModel',
     'LibSvmNuClassificationModel',
@@ -3,10 +9,4 @@
     ]
 
-import numpy as N
-from ctypes import cast, POINTER, c_int, c_double
-
-from model import LibSvmModel
-import libsvm
-
 class LibSvmClassificationResults:
     def __init__(self, model, dataset):

Modified: trunk/Lib/sandbox/svm/dataset.py
===================================================================
--- trunk/Lib/sandbox/svm/dataset.py	2006-07-14 09:05:30 UTC (rev 2101)
+++ trunk/Lib/sandbox/svm/dataset.py	2006-07-14 12:59:13 UTC (rev 2102)
@@ -1,3 +1,8 @@
+from ctypes import c_double, POINTER, cast
+import numpy as N
+
+import libsvm
+
 __all__ = [
     'LibSvmRegressionDataSet',
     'LibSvmClassificationDataSet',
@@ -5,11 +10,6 @@
     'LibSvmTestDataSet'
     ]
 
-from ctypes import c_double, POINTER, cast
-import numpy as N
-
-import libsvm
-
 class LibSvmDataSet:
     def __init__(self, data):
         self.data = data

Modified: trunk/Lib/sandbox/svm/kernel.py
===================================================================
--- trunk/Lib/sandbox/svm/kernel.py	2006-07-14 09:05:30 UTC (rev 2101)
+++ trunk/Lib/sandbox/svm/kernel.py	2006-07-14 12:59:13 UTC (rev 2102)
@@ -1,3 +1,7 @@
+import numpy as N
+
+import libsvm
+
 __all__ = [
     'LinearKernel',
     'PolynomialKernel',
@@ -7,10 +11,6 @@
     'PrecomputedKernel'
     ]
 
-import numpy as N
-
-import libsvm
-
 class LinearKernel:
     def __init__(self):
         self.kernel_type = libsvm.LINEAR

Modified: trunk/Lib/sandbox/svm/libsvm.py
===================================================================
--- trunk/Lib/sandbox/svm/libsvm.py	2006-07-14 09:05:30 UTC (rev 2101)
+++ trunk/Lib/sandbox/svm/libsvm.py	2006-07-14 12:59:13 UTC (rev 2102)
@@ -1,16 +1,4 @@
-__all__ = [
-    'svm_node_dtype',
-    'C_SVC',
-    'NU_SVC',
-    'ONE_CLASS',
-    'EPSILON_SVR',
-    'NU_SVR',
-    'LINEAR',
-    'POLY',
-    'RBF',
-    'SIGMOID',
-    'PRECOMPUTED'
-    ]
+import inspect
 
 import numpy as N
 from ctypes import c_int, c_double, POINTER, Structure, c_char_p
@@ -130,7 +118,6 @@
     (None, [POINTER(svm_model)])
     }
 
-import inspect
 for f, (restype, argtypes) in libsvm_api.iteritems():
     func = getattr(_libsvm, f)
     func.restype = restype

Modified: trunk/Lib/sandbox/svm/model.py
===================================================================
--- trunk/Lib/sandbox/svm/model.py	2006-07-14 09:05:30 UTC (rev 2101)
+++ trunk/Lib/sandbox/svm/model.py	2006-07-14 12:59:13 UTC (rev 2102)
@@ -1,3 +1,8 @@
+from ctypes import *
+
+from kernel import *
+import libsvm
+
 __all__ = [
     'LibSvmModel'
     ]
@@ -2,11 +7,8 @@
 
-from ctypes import *
 c_double_null_ptr = POINTER(c_double)()
 c_int_null_ptr = POINTER(c_int)()
 
-from kernel import *
-import libsvm
-
 class LibSvmModel:
-    def __init__(self, kernel, tolerance=0.001, shrinking=True, cache_size=40):
+    def __init__(self, kernel,
+                 tolerance=0.001, shrinking=True, cache_size=40):
         """

Modified: trunk/Lib/sandbox/svm/oneclass.py
===================================================================
--- trunk/Lib/sandbox/svm/oneclass.py	2006-07-14 09:05:30 UTC (rev 2101)
+++ trunk/Lib/sandbox/svm/oneclass.py	2006-07-14 12:59:13 UTC (rev 2102)
@@ -1,12 +1,12 @@
-__all__ = [
-    'LibSvmOneClassModel'
-    ]
-
 from ctypes import cast, POINTER, byref, c_double
 
 from model import LibSvmModel
 import libsvm
 
+__all__ = [
+    'LibSvmOneClassModel'
+    ]
+
 class LibSvmOneClassResults:
     def __init__(self, model, dataset):
         self.model = model

Modified: trunk/Lib/sandbox/svm/regression.py
===================================================================
--- trunk/Lib/sandbox/svm/regression.py	2006-07-14 09:05:30 UTC (rev 2101)
+++ trunk/Lib/sandbox/svm/regression.py	2006-07-14 12:59:13 UTC (rev 2102)
@@ -1,3 +1,9 @@
+from ctypes import cast, POINTER, c_double
+import numpy as N
+
+from model import LibSvmModel
+import libsvm
+
 __all__ = [
     'LibSvmEpsilonRegressionModel',
     'LibSvmNuRegressionModel'
@@ -3,10 +9,4 @@
     ]
 
-import numpy as N
-from ctypes import cast, POINTER, c_double
-
-from model import LibSvmModel
-import libsvm
-
 # XXX document why get_svr_probability could be useful