Merge branch 'feature/travis' into develop

Author: nwtgck

.gitignore

@@ -1 +1,3 @@
 /.idea
+*.egg-info/
+__pycache__/

.travis.yml

@@ -0,0 +1,35 @@
+# (from: https://qiita.com/masashi127/items/5bfcba5cad8e82958844)
+
+language: python
+
+python:
+  - 3.4
+  - 3.5
+  - 3.6
+
+addons:
+  apt:
+    packages:
+    # (from: https://github.com/dnouri/nolearn/blob/master/.travis.yml)
+    - libblas-dev
+    - liblapack-dev
+    - gfortran
+
+
+before_install:
+  - pip install -U pip setuptools wheel # (from: https://github.com/dnouri/nolearn/blob/master/.travis.yml)
+
+install:
+  - travis_wait travis_retry pip install -r requirements.txt # (from: https://github.com/dnouri/nolearn/blob/master/.travis.yml)
+  - pip install coveralls
+
+script:
+  - coverage run --source=nwtgck_hello_test setup.py test
+
+after_success:
+  - coveralls
+
+cache:
+  - apt
+  - directories:
+    - $HOME/.cache/pip

requirements.txt

@@ -0,0 +1,9 @@
+certifi==2017.11.5
+chardet==3.0.4
+docopt==0.6.2
+idna==2.6
+numpy==1.13.3
+requests==2.18.4
+scikit-learn==0.19.1
+scipy==1.0.0
+urllib3==1.22

setup.py

@@ -1,13 +1,21 @@
 # (from: https://github.com/masaponto/Python-MLP/blob/master/setup.py)
-from distutils.core import setup
+# (from: https://qiita.com/masashi127/items/5bfcba5cad8e82958844)
+# (from: https://qiita.com/hotoku/items/4789533f5e497f3dc6e0)
+
+from setuptools import setup, find_packages
+import sys
+
+sys.path.append('./src')
+sys.path.append('./tests')
 
 setup(
     name='multi_svr',
     version='0.1.0-SNAPSHOT',
     description='Multiple-targets Support Vector Regression',
     author='Ryo Ota',
     author_email='[email protected]',
-    install_requires=['scikit-learn', 'numpy'],
+    install_requires=['scikit-learn', 'numpy', 'SciPy'],
     py_modules=["multi_svr"],
-    package_dir={'': 'src'}
+    packages=find_packages(),
+    test_suite='tests'
 )

src/multi_svr.py

@@ -70,7 +70,7 @@ def predict(self, X):
   regressor.fit(X, y)
 
   pred_y = regressor.predict(X)
-  err    = metrics.mean_squared_error(y, pred_y, multioutput='raw_values')
+  errs   = metrics.mean_squared_error(y, pred_y, multioutput='raw_values')
 
   print('pred_y:', pred_y)
-  print('err:', err)
+  print('errs:', errs)

tests/__init__.py

@@ -0,0 +1,44 @@
+import unittest
+from sklearn import metrics
+
+import multi_svr
+
+class MultiSVRTest(unittest.TestCase):
+
+  def test_prediction(self):
+    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.MutilSVR(kernel='linear')
+    # Fit
+    regressor.fit(X, y)
+    # Predict
+    pred_y = regressor.predict(X)
+    # Calc errors
+    errs = metrics.mean_squared_error(y, pred_y, multioutput='raw_values')
+
+    # Errors should be small
+    assert(errs[0] < 0.05)
+    assert(errs[1] < 0.05)
+
+
+def suite():
+  suite = unittest.TestSuite()
+  suite.addTest(unittest.makeSuite(MultiSVRTest))
+  return suite