Merge branch 'hotfix/0.1.1'

Author: nwtgck

.travis.yml

@@ -24,7 +24,10 @@ install:
   - pip install coveralls
 
 script:
-  - coverage run --source=nwtgck_hello_test setup.py test
+  - coverage run --source=src setup.py test
+
+  - pip3 install --upgrade git+https://github.com/nwtgck/multi-svr-python.git@$TRAVIS_BRANCH
+  - python examples/example1.py
 
 after_success:
   - coveralls

README.md

@@ -13,6 +13,9 @@ Support Vector Regression (SVR) for multidimensional labels
  ## Usage
 
  ```python
+import multi_svr
+from sklearn import metrics
+
 X = [
   [0, 0],
   [0, 10],
@@ -32,7 +35,7 @@ y = [
 ]
 
 #  Create SVR
-regressor = multi_svr.MutilSVR(kernel='linear')
+regressor = multi_svr.MultiSVR(kernel='linear')
 # Fit
 regressor.fit(X, y)
 # Predict
@@ -44,6 +47,6 @@ errs = metrics.mean_squared_error(y, pred_y)
  ## How to test
 
  ```bash
- cd <this repo
+ cd <this repo>
  python setup.py test
  ```

examples/example1.py

@@ -0,0 +1,32 @@
+import multi_svr
+from sklearn import metrics
+
+X = [
+  [0, 0],
+  [0, 10],
+  [1, 10],
+  [1, 20],
+  [1, 30],
+  [1, 40]
+]
+
+y = [
+  [0, 0],
+  [0, 10],
+  [2, 10],
+  [2, 20],
+  [2, 30],
+  [2, 40]
+]
+
+#  Create SVR
+regressor = multi_svr.MultiSVR(kernel='linear')
+# Fit
+regressor.fit(X, y)
+# Predict
+pred_y = regressor.predict(X)
+# Calc errors
+errs = metrics.mean_squared_error(y, pred_y)
+
+print('pred_y:', pred_y)
+print('errs:', errs)

src/multi_svr.py renamed to multi_svr/__init__.py

@@ -3,7 +3,7 @@
 from sklearn import svm
 
 
-class MutilSVR(sklearn.base.BaseEstimator, sklearn.base.RegressorMixin):
+class MultiSVR(sklearn.base.BaseEstimator, sklearn.base.RegressorMixin):
   def __init__(self, **kwargs):
     self.__init_kwargs = kwargs
 
@@ -41,36 +41,3 @@ def predict(self, X):
 
     pred = np.column_stack(tuple(preds))
     return pred
-
-
-
-
-if __name__ == '__main__':
-  from sklearn import metrics
-  X = [
-    [0,  0],
-    [0, 10],
-    [1, 10],
-    [1, 20],
-    [1, 30],
-    [1, 40]
-  ]
-
-  y = [
-    [0,  0],
-    [0, 10],
-    [2, 10],
-    [2, 20],
-    [2, 30],
-    [2, 40]
-  ]
-
-  regressor = MutilSVR(kernel='linear')
-
-  regressor.fit(X, y)
-
-  pred_y = regressor.predict(X)
-  errs   = metrics.mean_squared_error(y, pred_y, multioutput='raw_values')
-
-  print('pred_y:', pred_y)
-  print('errs:', errs)

setup.py

@@ -5,12 +5,11 @@
 from setuptools import setup, find_packages
 import sys
 
-sys.path.append('./src')
 sys.path.append('./tests')
 
 setup(
     name='multi_svr',
-    version='0.1.0',
+    version='0.1.1',
     description='SVR for multidimensional label',
     author='Ryo Ota',
     author_email='[email protected]',

src/__init__.py

@@ -25,7 +25,7 @@ def test_prediction(self):
     ]
 
     #  Create SVR
-    regressor = multi_svr.MutilSVR(kernel='linear')
+    regressor = multi_svr.MultiSVR(kernel='linear')
     # Fit
     regressor.fit(X, y)
     # Predict