Skip to content
Snippets Groups Projects
Commit 07fbe9b0 authored by Baptiste Bauvin's avatar Baptiste Bauvin
Browse files

Deleted getCLString let genName

parent 31643844
No related branches found
No related tags found
No related merge requests found
......@@ -43,7 +43,7 @@ def saveResults(LABELS_DICTIONARY, stringAnalysis, views, classifierModule, clas
featureString = "-".join(views)
labelsString = "-".join(labelsSet)
timestr = time.strftime("%Y%m%d-%H%M%S")
CL_type_string = classifierModule.getCLString(classificationKWARGS)
CL_type_string = classifierModule.genName(classificationKWARGS)
outputFileName = directory + "/" + CL_type_string + "/" + timestr + "Results-" + CL_type_string + "-" + featureString + '-' + labelsString + \
'-learnRate' + str(learningRate) + '-' + name
if not os.path.exists(os.path.dirname(outputFileName)):
......
......@@ -6,11 +6,6 @@ import numpy as np
def genName(config):
return "FatLateFusion"
def getCLString(classificationKWARGS):
return "FatLateFusion"
def getBenchmark(benchmark, args=None):
benchmark["Multiview"]["FatLateFusion"] = ["take_everything"]
return benchmark
......
......@@ -149,16 +149,6 @@ def genParamsSets(classificationKWARGS, randomState, nIter=1):
# return bestSettings, fusionMethodConfig
def getCLString(classificationKWARGS):
"""Used to get the classifier name as a string"""
if classificationKWARGS["fusionType"] == "LateFusion":
reducedClassifiersNames = [classifierName[:4] for classifierName in classificationKWARGS["classifiersNames"]]
return "Fusion-" + "Late" + "-" + classificationKWARGS["fusionMethod"][:5] + "-" + \
"-".join(reducedClassifiersNames)
elif classificationKWARGS["fusionType"] == "EarlyFusion":
return "Fusion-" + "Early" + "-" + classificationKWARGS["fusionMethod"][:5] + "-" + \
classificationKWARGS["classifiersNames"]
class FusionClass:
"""The global representant of Fusion"""
......
......@@ -141,10 +141,6 @@ def gridSearch_hdf5(DATASET, labels, viewIndices, classificationKWARGS, learning
return bestSettings, None
def getCLString(classificationKWARGS):
return "Mumbo-" + "-".join(classificationKWARGS["classifiersNames"])
class MumboClass:
def __init__(self, randomState, NB_CORES=1, **kwargs):
self.maxIter = kwargs["maxIter"]
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment