diff --git a/Code/MonoMultiViewClassifiers/MonoviewClassifiers/Adaboost.py b/Code/MonoMultiViewClassifiers/MonoviewClassifiers/Adaboost.py index 500a2b8d952d8da23a95ffd1c61e13aac00d1919..cab2160a71d61d31977082f89da1f304f88e4aa6 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 5fe7d7488c9085eaeaa4136d84fa9b57218cfb41..92230b89387998ed91d7ea1dc0d7d62ca27e5644 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 ac7c286761497f4928ac287a582e990265f968b2..74adf696adf77a5f16f5fd03ba426e36e4af48f3 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 79ea71e43ef03f6919a8c08d3dedf186b10e0b9f..58d1521218508f5f9c7b366118bf78295afe0839 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 a84d914c815679e91076893ecb592791976e9934..cdb1afacd0c1e3650c726a10c86cc9ebb8f9472f 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 0bbd424d0fad8104c25421db79ffe1188965512c..b675c912c6b83cef0649f47c2cc6f5b535a3e191 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 87ad608a2b86fd411401dfc6111910295ea65ef5..cdaff4650fcd2e3b11c4addc28c04bfd88482446 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 c335a1e3492bd41c4fb182b18853f7fb75d94b8f..a90f6cdb228e4e4cc4e5300841237dfa9eda39c7 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 1a5044544d5da6a8c3aebfac83ad3a9a8a75ab56..58dcca2610c51b00c54af98140451b07318f1f6f 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