diff --git a/__pycache__/__init__.cpython-36.pyc b/__pycache__/__init__.cpython-36.pyc index 494c0e4..37fbf0c 100644 Binary files a/__pycache__/__init__.cpython-36.pyc and b/__pycache__/__init__.cpython-36.pyc differ diff --git a/q01_grid_search/__pycache__/__init__.cpython-36.pyc b/q01_grid_search/__pycache__/__init__.cpython-36.pyc index eed5319..641955f 100644 Binary files a/q01_grid_search/__pycache__/__init__.cpython-36.pyc and b/q01_grid_search/__pycache__/__init__.cpython-36.pyc differ diff --git a/q01_grid_search/__pycache__/build.cpython-36.pyc b/q01_grid_search/__pycache__/build.cpython-36.pyc index cac4a0b..178c106 100644 Binary files a/q01_grid_search/__pycache__/build.cpython-36.pyc and b/q01_grid_search/__pycache__/build.cpython-36.pyc differ diff --git a/q01_grid_search/build.py b/q01_grid_search/build.py index 20c99a1..004f4e6 100644 --- a/q01_grid_search/build.py +++ b/q01_grid_search/build.py @@ -19,4 +19,11 @@ # Write your solution here : - +def grid_search(X_train, y_train, model, param_grid, cv=3): + gridsearch_cv = GridSearchCV(estimator=model, param_grid=param_grid,\ + n_jobs=3, cv=cv) + gridsearch_cv.fit(X_train, y_train) + grid_cv_results = gridsearch_cv.cv_results_ + param_grid_results = grid_cv_results['params'] + param_grid_score = grid_cv_results['mean_test_score'] + return gridsearch_cv, param_grid_results, param_grid_score diff --git a/q01_grid_search/tests/__pycache__/__init__.cpython-36.pyc b/q01_grid_search/tests/__pycache__/__init__.cpython-36.pyc index 31ac328..7ee6892 100644 Binary files a/q01_grid_search/tests/__pycache__/__init__.cpython-36.pyc and b/q01_grid_search/tests/__pycache__/__init__.cpython-36.pyc differ diff --git a/q01_grid_search/tests/__pycache__/test_q01_grid_search.cpython-36.pyc b/q01_grid_search/tests/__pycache__/test_q01_grid_search.cpython-36.pyc index bf1afbe..5626cce 100644 Binary files a/q01_grid_search/tests/__pycache__/test_q01_grid_search.cpython-36.pyc and b/q01_grid_search/tests/__pycache__/test_q01_grid_search.cpython-36.pyc differ diff --git a/q02_fit/__pycache__/__init__.cpython-36.pyc b/q02_fit/__pycache__/__init__.cpython-36.pyc index 97c33cb..1bd47fd 100644 Binary files a/q02_fit/__pycache__/__init__.cpython-36.pyc and b/q02_fit/__pycache__/__init__.cpython-36.pyc differ diff --git a/q02_fit/__pycache__/build.cpython-36.pyc b/q02_fit/__pycache__/build.cpython-36.pyc index 3d41a62..ec24e58 100644 Binary files a/q02_fit/__pycache__/build.cpython-36.pyc and b/q02_fit/__pycache__/build.cpython-36.pyc differ diff --git a/q02_fit/build.py b/q02_fit/build.py index fbafb1a..6b74006 100644 --- a/q02_fit/build.py +++ b/q02_fit/build.py @@ -22,6 +22,10 @@ # Write your solution here : - - - +def fit(X_test, y_test): + rf_best_grid_cv = grid.best_estimator_ + y_pred_test = rf_best_grid_cv.predict(X_test) + acc_score = accuracy_score(y_true=y_test, y_pred=y_pred_test) + conf_mat = confusion_matrix(y_true=y_test, y_pred=y_pred_test) + classfn_report = classification_report(y_true=y_test, y_pred=y_pred_test) + return conf_mat, classfn_report, acc_score diff --git a/q02_fit/tests/__pycache__/__init__.cpython-36.pyc b/q02_fit/tests/__pycache__/__init__.cpython-36.pyc index 4a01850..6043e64 100644 Binary files a/q02_fit/tests/__pycache__/__init__.cpython-36.pyc and b/q02_fit/tests/__pycache__/__init__.cpython-36.pyc differ diff --git a/q02_fit/tests/__pycache__/test_q02_fit.cpython-36.pyc b/q02_fit/tests/__pycache__/test_q02_fit.cpython-36.pyc index 413b2fc..85208a9 100644 Binary files a/q02_fit/tests/__pycache__/test_q02_fit.cpython-36.pyc and b/q02_fit/tests/__pycache__/test_q02_fit.cpython-36.pyc differ