diff --git a/Code/MonoMutliViewClassifiers/ExecClassif.py b/Code/MonoMutliViewClassifiers/ExecClassif.py index 72571905b25a079a4a3f0a9c31cc8919482d60d2..6abb14ea090dca3bf44550049ec51d042cbcf282 100644 --- a/Code/MonoMutliViewClassifiers/ExecClassif.py +++ b/Code/MonoMutliViewClassifiers/ExecClassif.py @@ -302,6 +302,7 @@ SVMLinearKWARGSInit = {"0":map(int, args.CL_SVML_C.split(":"))[0]} SVMRBFKWARGSInit = {"0":map(int, args.CL_SVMR_C.split(":"))[0]} SVMPolyKWARGSInit = {"0":map(int, args.CL_SVMP_C.split(":"))[0], '1':map(int, args.CL_SVMP_deg.split(":"))[0]} DecisionTreeKWARGSInit = {"0":map(int, args.CL_DT_depth.split(":"))[0]} +print DecisionTreeKWARGSInit SGDKWARGSInit = {"2": map(float, args.CL_SGD_alpha.split(":"))[0], "1": args.CL_SGD_penalty.split(":")[0], "0":args.CL_SGD_loss.split(":")[0]} KNNKWARGSInit = {"0": map(float, args.CL_KNN_neigh.split(":"))[0]} diff --git a/Code/MonoMutliViewClassifiers/MonoviewClassifiers/DecisionTree.py b/Code/MonoMutliViewClassifiers/MonoviewClassifiers/DecisionTree.py index 4ee952316a246dd571348297b99fa3d9368c2048..626099e1cfd9ef4236b359c6b8a112484e5fd260 100644 --- a/Code/MonoMutliViewClassifiers/MonoviewClassifiers/DecisionTree.py +++ b/Code/MonoMutliViewClassifiers/MonoviewClassifiers/DecisionTree.py @@ -12,7 +12,6 @@ __status__ = "Prototype" # Production, Development, P def fit(DATASET, CLASS_LABELS, NB_CORES=1, **kwargs): maxDepth = int(kwargs['0']) - print maxDepth classifier = DecisionTreeClassifier(max_depth=maxDepth) classifier.fit(DATASET, CLASS_LABELS) return classifier diff --git a/Code/MonoMutliViewClassifiers/Multiview/Fusion/Fusion.py b/Code/MonoMutliViewClassifiers/Multiview/Fusion/Fusion.py index d30c4be38d3059731179d98a475da8a5eda53f2b..4255b2dada283fb03995f0b8f6d7529a92242504 100644 --- a/Code/MonoMutliViewClassifiers/Multiview/Fusion/Fusion.py +++ b/Code/MonoMutliViewClassifiers/Multiview/Fusion/Fusion.py @@ -64,6 +64,7 @@ class Fusion: fusionMethodClass = getattr(fusionMethodModule, fusionMethod) nbCores = NB_CORES classifierKWARGS = dict((key, value) for key, value in kwargs.iteritems() if key not in ['fusionType', 'fusionMethod']) + print classifierKWARGS self.classifier = fusionMethodClass(NB_CORES=nbCores, **classifierKWARGS) def fit_hdf5(self, DATASET, trainIndices=None, viewsIndices=None): diff --git a/Code/MonoMutliViewClassifiers/Multiview/Fusion/Methods/EarlyFusion.py b/Code/MonoMutliViewClassifiers/Multiview/Fusion/Methods/EarlyFusion.py index 3d799fe8d0ed76e6ec83a45eb2ed24b5f42bd7e3..641ddff36e61b5513f47bf19db4cb7d201830586 100644 --- a/Code/MonoMutliViewClassifiers/Multiview/Fusion/Methods/EarlyFusion.py +++ b/Code/MonoMutliViewClassifiers/Multiview/Fusion/Methods/EarlyFusion.py @@ -9,6 +9,7 @@ class EarlyFusionClassifier(object): def __init__(self, monoviewClassifierName, monoviewClassifierConfig, NB_CORES=1): self.monoviewClassifierName = monoviewClassifierName[0] self.monoviewClassifiersConfig = monoviewClassifierConfig[0] + print monoviewClassifierConfig self.monoviewClassifier = None self.nbCores = NB_CORES self.monoviewData = None