From 7a959391ab96fad77f1177b77f70512a80eeea5d Mon Sep 17 00:00:00 2001
From: bbauvin <baptiste.bauvin@centrale-marseille.fr>
Date: Wed, 4 Oct 2017 16:26:18 -0400
Subject: [PATCH] modified gridsearch name for all monoview classifiers
---
Code/MonoMutliViewClassifiers/MonoviewClassifiers/Adaboost.py | 2 +-
Code/MonoMutliViewClassifiers/MonoviewClassifiers/KNN.py | 2 +-
.../MonoviewClassifiers/RandomForest.py | 2 +-
Code/MonoMutliViewClassifiers/MonoviewClassifiers/SCM.py | 2 +-
Code/MonoMutliViewClassifiers/MonoviewClassifiers/SGD.py | 2 +-
Code/MonoMutliViewClassifiers/MonoviewClassifiers/SVMLinear.py | 2 +-
Code/MonoMutliViewClassifiers/MonoviewClassifiers/SVMPoly.py | 2 +-
Code/MonoMutliViewClassifiers/MonoviewClassifiers/SVMRBF.py | 2 +-
8 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/Code/MonoMutliViewClassifiers/MonoviewClassifiers/Adaboost.py b/Code/MonoMutliViewClassifiers/MonoviewClassifiers/Adaboost.py
index 406861fe..fb5e6a74 100644
--- a/Code/MonoMutliViewClassifiers/MonoviewClassifiers/Adaboost.py
+++ b/Code/MonoMutliViewClassifiers/MonoviewClassifiers/Adaboost.py
@@ -32,7 +32,7 @@ def getKWARGS(kwargsList):
return kwargsDict
-def gridSearch(X_train, y_train, nbFolds=4, metric=["accuracy_score", None], nIter=30, nbCores=1):
+def randomizedSearch(X_train, y_train, nbFolds=4, metric=["accuracy_score", None], nIter=30, nbCores=1):
pipeline = Pipeline([('classifier', AdaBoostClassifier())])
param= {"classifier__n_estimators": randint(1, 15),
diff --git a/Code/MonoMutliViewClassifiers/MonoviewClassifiers/KNN.py b/Code/MonoMutliViewClassifiers/MonoviewClassifiers/KNN.py
index 234ff43e..ee51ca59 100644
--- a/Code/MonoMutliViewClassifiers/MonoviewClassifiers/KNN.py
+++ b/Code/MonoMutliViewClassifiers/MonoviewClassifiers/KNN.py
@@ -28,7 +28,7 @@ def getKWARGS(kwargsList):
return kwargsDict
-def gridSearch(X_train, y_train, nbFolds=4, nbCores=1, metric=["accuracy_score", None], nIter=30 ):
+def randomizedSearch(X_train, y_train, nbFolds=4, nbCores=1, metric=["accuracy_score", None], nIter=30 ):
pipeline_KNN = Pipeline([('classifier', KNeighborsClassifier())])
param_KNN = {"classifier__n_neighbors": randint(1, 50)}
metricModule = getattr(Metrics, metric[0])
diff --git a/Code/MonoMutliViewClassifiers/MonoviewClassifiers/RandomForest.py b/Code/MonoMutliViewClassifiers/MonoviewClassifiers/RandomForest.py
index 370f679b..3a393906 100644
--- a/Code/MonoMutliViewClassifiers/MonoviewClassifiers/RandomForest.py
+++ b/Code/MonoMutliViewClassifiers/MonoviewClassifiers/RandomForest.py
@@ -32,7 +32,7 @@ def getKWARGS(kwargsList):
return kwargsDict
-def gridSearch(X_train, y_train, nbFolds=4, nbCores=1, metric=["accuracy_score", None], nIter=30):
+def randomizedSearch(X_train, y_train, nbFolds=4, nbCores=1, metric=["accuracy_score", None], nIter=30):
pipeline_rf = Pipeline([('classifier', RandomForestClassifier())])
param_rf = {"classifier__n_estimators": randint(1, 30),
"classifier__max_depth":randint(1, 30)}
diff --git a/Code/MonoMutliViewClassifiers/MonoviewClassifiers/SCM.py b/Code/MonoMutliViewClassifiers/MonoviewClassifiers/SCM.py
index 19a46355..89e240fc 100644
--- a/Code/MonoMutliViewClassifiers/MonoviewClassifiers/SCM.py
+++ b/Code/MonoMutliViewClassifiers/MonoviewClassifiers/SCM.py
@@ -60,7 +60,7 @@ def getKWARGS(kwargsList):
-def gridSearch(X_train, y_train, nbFolds=4, metric=["accuracy_score", None], nIter=30, nbCores=1):
+def randomizedSearch(X_train, y_train, nbFolds=4, metric=["accuracy_score", None], nIter=30, nbCores=1):
metricModule = getattr(Metrics, metric[0])
if metric[1]!=None:
diff --git a/Code/MonoMutliViewClassifiers/MonoviewClassifiers/SGD.py b/Code/MonoMutliViewClassifiers/MonoviewClassifiers/SGD.py
index 93fb3910..59a772b5 100644
--- a/Code/MonoMutliViewClassifiers/MonoviewClassifiers/SGD.py
+++ b/Code/MonoMutliViewClassifiers/MonoviewClassifiers/SGD.py
@@ -37,7 +37,7 @@ def getKWARGS(kwargsList):
return kwargsDict
-def gridSearch(X_train, y_train, nbFolds=4, nbCores=1, metric=["accuracy_score", None], nIter=30):
+def randomizedSearch(X_train, y_train, nbFolds=4, nbCores=1, metric=["accuracy_score", None], nIter=30):
pipeline_SGD = Pipeline([('classifier', SGDClassifier())])
losses = ['log', 'modified_huber']
penalties = ["l1", "l2", "elasticnet"]
diff --git a/Code/MonoMutliViewClassifiers/MonoviewClassifiers/SVMLinear.py b/Code/MonoMutliViewClassifiers/MonoviewClassifiers/SVMLinear.py
index 0229110d..3b98ef66 100644
--- a/Code/MonoMutliViewClassifiers/MonoviewClassifiers/SVMLinear.py
+++ b/Code/MonoMutliViewClassifiers/MonoviewClassifiers/SVMLinear.py
@@ -28,7 +28,7 @@ def getKWARGS(kwargsList):
return kwargsDict
-def gridSearch(X_train, y_train, nbFolds=4, nbCores=1, metric=["accuracy_score", None], nIter=30):
+def randomizedSearch(X_train, y_train, nbFolds=4, nbCores=1, metric=["accuracy_score", None], nIter=30):
pipeline_SVMLinear = Pipeline([('classifier', SVC(kernel="linear", max_iter=1000))])
param_SVMLinear = {"classifier__C":randint(1, 10000)}
metricModule = getattr(Metrics, metric[0])
diff --git a/Code/MonoMutliViewClassifiers/MonoviewClassifiers/SVMPoly.py b/Code/MonoMutliViewClassifiers/MonoviewClassifiers/SVMPoly.py
index d5506e6d..2300e481 100644
--- a/Code/MonoMutliViewClassifiers/MonoviewClassifiers/SVMPoly.py
+++ b/Code/MonoMutliViewClassifiers/MonoviewClassifiers/SVMPoly.py
@@ -31,7 +31,7 @@ def getKWARGS(kwargsList):
return kwargsDict
-def gridSearch(X_train, y_train, nbFolds=4, nbCores=1, metric=["accuracy_score", None], nIter=30):
+def randomizedSearch(X_train, y_train, nbFolds=4, nbCores=1, metric=["accuracy_score", None], nIter=30):
pipeline_SVMPoly = Pipeline([('classifier', SVC(kernel="poly", max_iter=1000))])
param_SVMPoly = {"classifier__C": randint(1, 10000), "classifier__degree":randint(1, 30)}
metricModule = getattr(Metrics, metric[0])
diff --git a/Code/MonoMutliViewClassifiers/MonoviewClassifiers/SVMRBF.py b/Code/MonoMutliViewClassifiers/MonoviewClassifiers/SVMRBF.py
index e232c1ba..11415da2 100644
--- a/Code/MonoMutliViewClassifiers/MonoviewClassifiers/SVMRBF.py
+++ b/Code/MonoMutliViewClassifiers/MonoviewClassifiers/SVMRBF.py
@@ -29,7 +29,7 @@ def getKWARGS(kwargsList):
return kwargsDict
-def gridSearch(X_train, y_train, nbFolds=4, nbCores=1, metric=["accuracy_score", None], nIter=30):
+def randomizedSearch(X_train, y_train, nbFolds=4, nbCores=1, metric=["accuracy_score", None], nIter=30):
pipeline_SVMRBF = Pipeline([('classifier', SVC(kernel="rbf", max_iter=1000))])
param_SVMRBF = {"classifier__C": randint(1, 10000)}
metricModule = getattr(Metrics, metric[0])
--
GitLab