Skip to content
Snippets Groups Projects
Commit 3baacb5a authored by Pierre LOTTE's avatar Pierre LOTTE
Browse files

Change results structure

parent 89285604
Branches
No related tags found
No related merge requests found
......@@ -11,7 +11,7 @@ class BaseResults():
self.path = path
self.algos = algos
self.configs = config_names
self.result = {"roc": {}, "f1": {}}
self.result = {}
def compute(self, auto_split=False):
"""
......
......@@ -38,25 +38,21 @@ class ROCResults(BaseResults):
roc, f1 = self.__compute_score(labels, y_pred_path)
if algo in self.result["roc"]:
self.result["roc"][algo][config_name] = {"classic": round(roc, 4)}
self.result["f1"][algo][config_name] = {"classic": round(f1, 4)}
self.result[algo][config_name] = {"classic": {"roc": round(roc, 4), "f1": round(f1, 4)}}
else:
self.result["roc"][algo] = {config_name: {"classic": round(roc, 4)}}
self.result["f1"][algo] = {config_name: {"classic": round(f1, 4)}}
self.result[algo] = {config_name: {"classic": {"roc": round(roc, 4), "f1": round(f1, 4)}}}
# Compute results for automatically splitted dataset
if auto_split:
files = __exec(f"find -L {self.path}/{config_name}/results_{algo} -regex '^.*dataset[_0-9]+_auto_split_{algo}.ts'")
roc, f1 = self.__compute_score(labels, files, local=True)
self.result["roc"][algo][f"{config_name}"]["auto_split"] = round(roc, 4)
self.result["f1"][algo][f"{config_name}"]["auto_split"] = round(f1, 4)
self.result[algo][f"{config_name}"]["auto_split"] = {"roc": round(roc, 4), "f1": round(f1, 4)}
# Compute results for splitted dataset
files = __exec(f"find -L {self.path}/{config_name}/results_{algo} -regex '^.*dataset[_0-9]+_{algo}.ts'")
roc, f1 = self.__compute_score(labels, files, local=True)
self.result["roc"][algo][f"{config_name}"]["split"] = round(roc, 4)
self.result["f1"][algo][f"{config_name}"]["split"] = round(f1, 4)
self.result[algo][f"{config_name}"]["split"] = {"roc": round(roc, 4), "f1": round(f1, 4)}
print(json.dumps(self.result))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment