diff --git a/__init__.pyc b/__init__.pyc index 800b98f..5d22c4d 100644 Binary files a/__init__.pyc and b/__init__.pyc differ diff --git a/q01_myXGBoost/__init__.pyc b/q01_myXGBoost/__init__.pyc index dcfccf7..eea1dcd 100644 Binary files a/q01_myXGBoost/__init__.pyc and b/q01_myXGBoost/__init__.pyc differ diff --git a/q01_myXGBoost/build.py b/q01_myXGBoost/build.py index f000406..1d093c1 100644 --- a/q01_myXGBoost/build.py +++ b/q01_myXGBoost/build.py @@ -19,7 +19,11 @@ # Write your solution here : - - - - +def myXGBoost(X_train, X_test, y_train, y_test, model, param_grid, Kfold=3, **kwargs): + gridsearch=GridSearchCV(estimator=model, param_grid=param_grid, cv=Kfold, return_train_score=True) + gridsearch.fit(X_train,y_train) + best_params = gridsearch.best_params_ + score = accuracy_score(y_test, gridsearch.predict(X_test)) + model.set_params(**best_params) + return score, best_params + diff --git a/q01_myXGBoost/build.pyc b/q01_myXGBoost/build.pyc index 2b98a8a..adea2ea 100644 Binary files a/q01_myXGBoost/build.pyc and b/q01_myXGBoost/build.pyc differ diff --git a/q01_myXGBoost/tests/__init__.pyc b/q01_myXGBoost/tests/__init__.pyc index 7411455..a7ed859 100644 Binary files a/q01_myXGBoost/tests/__init__.pyc and b/q01_myXGBoost/tests/__init__.pyc differ diff --git a/q01_myXGBoost/tests/test_q01_myXGBoost.pyc b/q01_myXGBoost/tests/test_q01_myXGBoost.pyc index 54780c7..2144796 100644 Binary files a/q01_myXGBoost/tests/test_q01_myXGBoost.pyc and b/q01_myXGBoost/tests/test_q01_myXGBoost.pyc differ diff --git a/q02_param2/__init__.pyc b/q02_param2/__init__.pyc index fae1a21..c593879 100644 Binary files a/q02_param2/__init__.pyc and b/q02_param2/__init__.pyc differ diff --git a/q02_param2/build.py b/q02_param2/build.py index 156fe17..72469d9 100644 --- a/q02_param2/build.py +++ b/q02_param2/build.py @@ -1,7 +1,10 @@ +# %load q02_param2/build.py # Default imports from sklearn.model_selection import train_test_split from xgboost import XGBClassifier +from sklearn.model_selection import GridSearchCV import pandas as pd +from sklearn.metrics import accuracy_score from greyatomlib.Xgboost_project.q01_myXGBoost.build import myXGBoost # load data @@ -19,3 +22,16 @@ # Write your solution here : + +def param2(X_train, X_test, y_train, y_test,model,param_grid): + + param_grid1 = {"max_depth": [2, 3, 4, 5, 6, 7, 9, 11], + "min_child_weight": [4, 6, 7, 8], + "subsample": [0.6, .7, .8, .9, 1], + "colsample_bytree": [0.6, .7, .8, .9, 1] + } + ac,bst=myXGBoost(X_train, X_test, y_train, y_test,model,param_grid1,KFold=3) + m1=model.set_params(**bst) + h,j=myXGBoost(X_train, X_test, y_train, y_test,m1,param_grid,KFold=3) + #print model + return h,j diff --git a/q02_param2/build.pyc b/q02_param2/build.pyc index 1db061f..6f40c7b 100644 Binary files a/q02_param2/build.pyc and b/q02_param2/build.pyc differ diff --git a/q02_param2/tests/__init__.pyc b/q02_param2/tests/__init__.pyc index 058448a..b9024e4 100644 Binary files a/q02_param2/tests/__init__.pyc and b/q02_param2/tests/__init__.pyc differ diff --git a/q02_param2/tests/test_q02_param2.pyc b/q02_param2/tests/test_q02_param2.pyc index 5e496da..b2d8144 100644 Binary files a/q02_param2/tests/test_q02_param2.pyc and b/q02_param2/tests/test_q02_param2.pyc differ diff --git a/q03_xgboost/__init__.pyc b/q03_xgboost/__init__.pyc index 4fb1998..f10e8bd 100644 Binary files a/q03_xgboost/__init__.pyc and b/q03_xgboost/__init__.pyc differ diff --git a/q03_xgboost/build.py b/q03_xgboost/build.py index fc75b96..5c56f94 100644 --- a/q03_xgboost/build.py +++ b/q03_xgboost/build.py @@ -1,6 +1,8 @@ +# %load q03_xgboost/build.py # Default imports from sklearn.model_selection import train_test_split from xgboost import XGBClassifier +from sklearn.model_selection import GridSearchCV import pandas as pd from sklearn.metrics import accuracy_score @@ -10,7 +12,15 @@ X = dataset.iloc[:, :-1] y = dataset.iloc[:, -1] X_train, X_test, y_train, y_test = train_test_split(X, y, test_size=0.33, random_state=9) - - # Write your solution here : - +def xgboost(X_train, X_test, y_train, y_test,**kwargs): + model=XGBClassifier(seed=9) + model.set_params(**kwargs) + #ac,bst=myXGBoost(X_train, X_test, y_train, y_test,model,param_grid1,KFold=3) + #h,j=param2(X_train, X_test, y_train, y_test,model,param_grid2) + #return h,j + #print model + model.fit(X_train,y_train) + d=model.predict(X_test) + a=accuracy_score(y_test,d) + return a diff --git a/q03_xgboost/build.pyc b/q03_xgboost/build.pyc index fab0e81..edd72eb 100644 Binary files a/q03_xgboost/build.pyc and b/q03_xgboost/build.pyc differ diff --git a/q03_xgboost/tests/__init__.pyc b/q03_xgboost/tests/__init__.pyc index c17cec4..1e6b3f9 100644 Binary files a/q03_xgboost/tests/__init__.pyc and b/q03_xgboost/tests/__init__.pyc differ diff --git a/q03_xgboost/tests/test_q03_xgboost.pyc b/q03_xgboost/tests/test_q03_xgboost.pyc index 921bfbf..5a35f53 100644 Binary files a/q03_xgboost/tests/test_q03_xgboost.pyc and b/q03_xgboost/tests/test_q03_xgboost.pyc differ