diff --git a/classifiers.py b/classifiers.py index b334d556d908ba9deac9af1e2c04536fd62df8a8..0d675848425d0787a23df8961bb3426280d0e887 100644 --- a/classifiers.py +++ b/classifiers.py @@ -14,19 +14,20 @@ classifiers = [ ('bayes', MultinomialNB()), ('lr', LogisticRegression()), ('sgd', SGDClassifier()), + ('svm', SVC() ), #('decisionTree',DecisionTreeClassifier()), ('rfc', RandomForestClassifier()), - ('knn', KNeighborsClassifier()), - ('svm', SVC() ) + #('knn', KNeighborsClassifier()) ] -param_grid_svm = {'C':[1,10,100,1000],'gamma':[0.1,0.001,0.0001], 'kernel':['linear','rbf']} +param_grid_svm = {'kernel':['linear','rbf']} #param_grid_decisionTree = { 'criterion' : ['gini', 'entropy'], 'max_depth':range(5,10), 'min_samples_split': range(5,10), 'min_samples_leaf': range(1,5) } -param_grid_rfc = { 'n_estimators': [200, 500], 'max_features': ['auto', 'sqrt', 'log2'], 'max_depth' : [4,5,6,7,8], 'criterion' :['gini', 'entropy'] } -param_grid_lr = {"C":np.logspace(-3,3,7), "penalty":['none',"l2"]} -param_grid_sgd = { "loss" : ["hinge", "log", "squared_hinge", "modified_huber"], "alpha" : [0.0001, 0.001, 0.01, 0.1], "penalty" : ["l2", "l1", "none"], "max_iter" : [500]} -param_grid_knn = {'n_neighbors' : list(range(3,20)), 'weights' : ['uniform', 'distance'], 'metric' : ['euclidean', 'manhattan'] } +param_grid_rfc = { 'max_features': ['sqrt', 'log2'], 'max_depth' : [4,5,6,7,8]} +param_grid_lr = {"C":np.logspace(-3,3,7)} +param_grid_sgd = { "loss" : ["log", "modified_huber"]} +#param_grid_knn = {'n_neighbors' : list(range(3,20)), 'weights' : ['uniform', 'distance'], 'metric' : ['euclidean', 'manhattan'] } + grid_params = [ ('bayes', None), @@ -35,6 +36,6 @@ grid_params = [ ('svm', param_grid_svm), #('decisionTree', param_grid_decisionTree), ('rfc', param_grid_rfc ), - ('knn', param_grid_knn), + #('knn', param_grid_knn), ]