From fd3b0d932abcf30e0e23d767db80f06e3513c259 Mon Sep 17 00:00:00 2001
From: bbauvin <baptiste.bauvin@centrale-marseille.fr>
Date: Mon, 6 Nov 2017 09:10:22 -0500
Subject: [PATCH] Minor changes

---
 Code/MonoMultiViewClassifiers/MonoviewClassifiers/Adaboost.py | 4 ++--
 .../MonoviewClassifiers/DecisionTree.py                       | 2 ++
 Code/MonoMultiViewClassifiers/MonoviewClassifiers/KNN.py      | 2 ++
 .../MonoviewClassifiers/RandomForest.py                       | 2 ++
 Code/MonoMultiViewClassifiers/MonoviewClassifiers/SCM.py      | 2 ++
 Code/MonoMultiViewClassifiers/MonoviewClassifiers/SGD.py      | 2 ++
 .../MonoMultiViewClassifiers/MonoviewClassifiers/SVMLinear.py | 2 ++
 Code/MonoMultiViewClassifiers/MonoviewClassifiers/SVMPoly.py  | 2 ++
 Code/MonoMultiViewClassifiers/MonoviewClassifiers/SVMRBF.py   | 2 ++
 9 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/Code/MonoMultiViewClassifiers/MonoviewClassifiers/Adaboost.py b/Code/MonoMultiViewClassifiers/MonoviewClassifiers/Adaboost.py
index 500a2b8d..cab2160a 100644
--- a/Code/MonoMultiViewClassifiers/MonoviewClassifiers/Adaboost.py
+++ b/Code/MonoMultiViewClassifiers/MonoviewClassifiers/Adaboost.py
@@ -17,7 +17,7 @@ __author__ = "Baptiste Bauvin"
 __status__ = "Prototype"  # Production, Development, Prototype
 
 
-def canProbas(a=10):
+def canProbas():
     return True
 
 
@@ -48,7 +48,7 @@ def getKWARGS(kwargsList):
         elif kwargName == "CL_Adaboost_b_est":
             kwargsDict['1'] = kwargValue
         else:
-            raise(ValueError, "Wrong arguments served to Adaboost")
+            raise ValueError("Wrong arguments served to Adaboost")
     return kwargsDict
 
 
diff --git a/Code/MonoMultiViewClassifiers/MonoviewClassifiers/DecisionTree.py b/Code/MonoMultiViewClassifiers/MonoviewClassifiers/DecisionTree.py
index 5fe7d748..92230b89 100644
--- a/Code/MonoMultiViewClassifiers/MonoviewClassifiers/DecisionTree.py
+++ b/Code/MonoMultiViewClassifiers/MonoviewClassifiers/DecisionTree.py
@@ -46,6 +46,8 @@ def getKWARGS(kwargsList):
             kwargsDict['1'] = kwargValue
         if kwargName == "CL_DecisionTree_splitter":
             kwargsDict['2'] = kwargValue
+        else:
+            raise ValueError("Wrong arguments served to DecisionTree")
     return kwargsDict
 
 
diff --git a/Code/MonoMultiViewClassifiers/MonoviewClassifiers/KNN.py b/Code/MonoMultiViewClassifiers/MonoviewClassifiers/KNN.py
index ac7c2867..74adf696 100644
--- a/Code/MonoMultiViewClassifiers/MonoviewClassifiers/KNN.py
+++ b/Code/MonoMultiViewClassifiers/MonoviewClassifiers/KNN.py
@@ -46,6 +46,8 @@ def getKWARGS(kwargsList):
             kwargsDict['2'] = kwargValue
         if kwargName == "CL_KNN_p":
             kwargsDict['3'] = int(kwargValue)
+        else:
+            raise ValueError("Wrong arguments served to KNN")
     return kwargsDict
 
 
diff --git a/Code/MonoMultiViewClassifiers/MonoviewClassifiers/RandomForest.py b/Code/MonoMultiViewClassifiers/MonoviewClassifiers/RandomForest.py
index 79ea71e4..58d15212 100644
--- a/Code/MonoMultiViewClassifiers/MonoviewClassifiers/RandomForest.py
+++ b/Code/MonoMultiViewClassifiers/MonoviewClassifiers/RandomForest.py
@@ -45,6 +45,8 @@ def getKWARGS(kwargsList):
             kwargsDict['1'] = kwargValue
         elif kwargName == "CL_RandomForest_criterion":
             kwargsDict['2'] = kwargValue
+        else:
+            raise ValueError("Wrong arguments served to RandomForest")
     return kwargsDict
 
 
diff --git a/Code/MonoMultiViewClassifiers/MonoviewClassifiers/SCM.py b/Code/MonoMultiViewClassifiers/MonoviewClassifiers/SCM.py
index a84d914c..cdb1afac 100644
--- a/Code/MonoMultiViewClassifiers/MonoviewClassifiers/SCM.py
+++ b/Code/MonoMultiViewClassifiers/MonoviewClassifiers/SCM.py
@@ -78,6 +78,8 @@ def getKWARGS(kwargsList):
             kwargsDict['1'] = int(kwargValue)
         elif kwargName == "CL_SCM_p":
             kwargsDict['2'] = float(kwargValue)
+        else:
+            raise ValueError("Wrong arguments served to SCM")
     return kwargsDict
 
 
diff --git a/Code/MonoMultiViewClassifiers/MonoviewClassifiers/SGD.py b/Code/MonoMultiViewClassifiers/MonoviewClassifiers/SGD.py
index 0bbd424d..b675c912 100644
--- a/Code/MonoMultiViewClassifiers/MonoviewClassifiers/SGD.py
+++ b/Code/MonoMultiViewClassifiers/MonoviewClassifiers/SGD.py
@@ -45,6 +45,8 @@ def getKWARGS(kwargsList):
             kwargsDict['1'] = kwargValue
         elif kwargName == "CL_SGD_alpha":
             kwargsDict['2'] = float(kwargValue)
+        else:
+            raise ValueError("Wrong arguments served to SGD")
     return kwargsDict
 
 
diff --git a/Code/MonoMultiViewClassifiers/MonoviewClassifiers/SVMLinear.py b/Code/MonoMultiViewClassifiers/MonoviewClassifiers/SVMLinear.py
index 87ad608a..cdaff465 100644
--- a/Code/MonoMultiViewClassifiers/MonoviewClassifiers/SVMLinear.py
+++ b/Code/MonoMultiViewClassifiers/MonoviewClassifiers/SVMLinear.py
@@ -36,6 +36,8 @@ def getKWARGS(kwargsList):
     for (kwargName, kwargValue) in kwargsList:
         if kwargName == "CL_SVMLinear_C":
             kwargsDict['0'] = int(kwargValue)
+        else:
+            raise ValueError("Wrong arguments served to SVMLinear")
     return kwargsDict
 
 
diff --git a/Code/MonoMultiViewClassifiers/MonoviewClassifiers/SVMPoly.py b/Code/MonoMultiViewClassifiers/MonoviewClassifiers/SVMPoly.py
index c335a1e3..a90f6cdb 100644
--- a/Code/MonoMultiViewClassifiers/MonoviewClassifiers/SVMPoly.py
+++ b/Code/MonoMultiViewClassifiers/MonoviewClassifiers/SVMPoly.py
@@ -39,6 +39,8 @@ def getKWARGS(kwargsList):
             kwargsDict['0'] = int(kwargValue)
         elif kwargName == "CL_SVMPoly_deg":
             kwargsDict['1'] = int(kwargValue)
+        else:
+            raise ValueError("Wrong arguments served to SVMPoly")
     return kwargsDict
 
 
diff --git a/Code/MonoMultiViewClassifiers/MonoviewClassifiers/SVMRBF.py b/Code/MonoMultiViewClassifiers/MonoviewClassifiers/SVMRBF.py
index 1a504454..58dcca26 100644
--- a/Code/MonoMultiViewClassifiers/MonoviewClassifiers/SVMRBF.py
+++ b/Code/MonoMultiViewClassifiers/MonoviewClassifiers/SVMRBF.py
@@ -36,6 +36,8 @@ def getKWARGS(kwargsList):
     for (kwargName, kwargValue) in kwargsList:
         if kwargName == "CL_SVMRBF_C":
             kwargsDict['0'] = int(kwargValue)
+        else:
+            raise ValueError("Wrong arguments served to SVMRBF")
     return kwargsDict
 
 
-- 
GitLab