Merge branch 'master' into 'farah_notation_and_related_work'

# Conflicts:
#   .gitignore

experiments/breast_cancer/stage1/params.json

+{
+    "scorer": "accuracy",
+    "best_score_train": 0.96,
+    "best_score_test": 0.956140350877193,
+    "best_parameters": {
+        "max_depth": 20,
+        "max_features": "sqrt",
+        "min_samples_leaf": 1,
+        "n_estimators": 1000
+    }
+}
\ No newline at end of file

experiments/diabetes/stage1/params.json

+{
+    "scorer": "neg_mean_squared_error",
+    "best_score_train": -3380.975223665973,
+    "best_score_test": -2604.589761961369,
+    "best_parameters": {
+        "max_depth": 17,
+        "max_features": "auto",
+        "min_samples_leaf": 10,
+        "n_estimators": 804
+    },
+    "random_seed": 1679
+}
\ No newline at end of file

experiments/digits/stage1/params.json

+{
+    "scorer": "accuracy",
+    "best_score_train": 0.9767932489451476,
+    "best_score_test": 0.9861111111111112,
+    "best_parameters": {
+        "max_depth": 16,
+        "max_features": "sqrt",
+        "min_samples_leaf": 1,
+        "n_estimators": 1000
+    },
+    "random_seed": 1679
+}
\ No newline at end of file

experiments/iris/stage1/params.json

+{
+    "scorer": "accuracy",
+    "best_score_train": 0.9576271186440678,
+    "best_score_test": 1.0,
+    "best_parameters": {
+        "max_depth": 20,
+        "max_features": "log2",
+        "min_samples_leaf": 1,
+        "n_estimators": 1000
+    },
+    "random_seed": 883
+}
\ No newline at end of file

experiments/linnerud/stage1/params.json

+{
+    "scorer": "neg_mean_squared_error",
+    "best_score_train": -268.00052987557854,
+    "best_score_test": -206.18071759259263,
+    "best_parameters": {
+        "max_depth": 3,
+        "max_features": "sqrt",
+        "min_samples_leaf": 232,
+        "n_estimators": 16
+    },
+    "random_seed": 1679
+}
\ No newline at end of file

experiments/wine/stage1/params.json

+{
+    "scorer": "accuracy",
+    "best_score_train": 0.9857142857142858,
+    "best_score_test": 0.9722222222222222,
+    "best_parameters": {
+        "max_depth": 20,
+        "max_features": "log2",
+        "min_samples_leaf": 1,
+        "n_estimators": 1000
+    },
+    "random_seed": 1679
+}
\ No newline at end of file

requirements.txt

@@ -8,3 +8,8 @@ coverage
 awscli
 flake8
 python-dotenv>=0.5.1
+scikit-learn
+git+git://github.com/darenr/scikit-optimize@master
+python-dotenv
+matplotlib
+pandas
\ No newline at end of file

setup.py

@@ -2,7 +2,8 @@ from setuptools import find_packages, setup
 
 setup(
     name='bolsonaro',
-    packages=find_packages(),
+    packages=find_packages(where="code", exclude=['doc', 'dev']),
+    package_dir={'': "code"},
     version='0.1.0',
     description='Bolsonaro project of QARMA non-permanents: deforesting random forest using OMP.',
     author='QARMA team',