Begin refactor main scripts

This commit is contained in:
2022-04-09 19:12:47 +02:00
parent 300033ce4e
commit de90374960
6 changed files with 182 additions and 128 deletions

View File

@@ -1159,3 +1159,56 @@ class Summary:
input_data=self.best_results(score=score, n=n), input_data=self.best_results(score=score, n=n),
sort_key="metric", sort_key="metric",
) )
class PairCheck:
def __init__(self, score, model_a, model_b, winners=False, loosers=False):
self.score = score
self.model_a = model_a
self.model_b = model_b
self.winners = winners
self.loosers = loosers
self.winners_data = []
self.loosers_data = []
self.tie_data = []
def compute(self):
summary = Summary()
summary.acquire()
best_a = summary.best_result(
criterion="model", value=self.model_a, score=self.score
)
best_b = summary.best_result(
criterion="model", value=self.model_b, score=self.score
)
report_a = StubReport(os.path.join(Folders.results, best_a["file"]))
report_a.report()
report_b = StubReport(os.path.join(Folders.results, best_b["file"]))
report_b.report()
for result_a, result_b in zip(report_a.lines, report_b.lines):
result = result_a["score"] - result_b["score"]
if result > 0:
self.winners_data.append(result_a["dataset"])
elif result < 0:
self.loosers_data.append(result_a["dataset"])
else:
self.tie_data.append(result_a["dataset"])
def print(self):
print(f"{'Model':<20} {'File':<70} {'Score':<10} Win Tie Loose")
print("=" * 20 + " " + "=" * 70 + " " + "=" * 10 + " === === =====")
print(
f"{self.model_a:<20} {self.best_a['file']:<70} {report_1.score:10.5f}"
)
print(
f"{model2:<20} {best_2['file']:<70} "
f"{report_2.score:10.5f} "
f"{TextColor.GREEN}{win:3d} {TextColor.YELLOW}{tie:3d} "
f"{TextColor.RED}{loose:5d}"
)
if win_results:
print(TextColor.GREEN + "Winners:")
print(winners)
if loose_results:
print(TextColor.RED + "Loosers:")
print(loosers)

View File

@@ -64,8 +64,8 @@ def parse_arguments():
) )
(excel, score, model, key, number, hidden) = parse_arguments() if __name__ == "__main__":
(excel, score, model, key, number, hidden) = parse_arguments()
data = Summary(hidden=hidden) data = Summary(hidden=hidden)
data.acquire() data.acquire()
data.list_results(score=score, model=model, sort_key=key, number=number) data.list_results(score=score, model=model, sort_key=key, number=number)

View File

@@ -117,7 +117,8 @@ def parse_arguments():
) )
( if __name__ == "__main__":
(
stratified, stratified,
score, score,
model, model,
@@ -130,11 +131,11 @@ def parse_arguments():
report, report,
experiment_title, experiment_title,
dataset, dataset,
) = parse_arguments() ) = parse_arguments()
report = report or dataset is not None report = report or dataset is not None
if grid_paramfile: if grid_paramfile:
paramfile = False paramfile = False
job = Experiment( job = Experiment(
score_name=score, score_name=score,
model_name=model, model_name=model,
stratified=stratified, stratified=stratified,
@@ -146,12 +147,12 @@ job = Experiment(
platform=platform, platform=platform,
title=experiment_title, title=experiment_title,
folds=folds, folds=folds,
) )
job.do_experiment() job.do_experiment()
if report: if report:
result_file = job.get_output_file() result_file = job.get_output_file()
report = Report(result_file) report = Report(result_file)
report.report() report.report()
if dataset is not None: if dataset is not None:
print(f"Partial result file removed: {result_file}") print(f"Partial result file removed: {result_file}")
os.remove(result_file) os.remove(result_file)

View File

@@ -59,26 +59,26 @@ def parse_arguments():
) )
( if __name__ == "__main__":
(
score, score,
model1, model1,
model2, model2,
win_results, win_results,
loose_results, loose_results,
) = parse_arguments() ) = parse_arguments()
summary = Summary()
summary = Summary() summary.acquire()
summary.acquire() win = tie = loose = 0
win = tie = loose = 0 winners = []
winners = [] loosers = []
loosers = [] best_1 = summary.best_result(criterion="model", value=model1, score=score)
best_1 = summary.best_result(criterion="model", value=model1, score=score) best_2 = summary.best_result(criterion="model", value=model2, score=score)
best_2 = summary.best_result(criterion="model", value=model2, score=score) report_1 = StubReport(os.path.join(Folders.results, best_1["file"]))
report_1 = StubReport(os.path.join(Folders.results, best_1["file"])) report_1.report()
report_1.report() report_2 = StubReport(os.path.join(Folders.results, best_2["file"]))
report_2 = StubReport(os.path.join(Folders.results, best_2["file"])) report_2.report()
report_2.report() for result1, result2 in zip(report_1.lines, report_2.lines):
for result1, result2 in zip(report_1.lines, report_2.lines):
result = result1["score"] - result2["score"] result = result1["score"] - result2["score"]
if result > 0: if result > 0:
win += 1 win += 1
@@ -88,18 +88,18 @@ for result1, result2 in zip(report_1.lines, report_2.lines):
loosers.append(result1["dataset"]) loosers.append(result1["dataset"])
else: else:
tie += 1 tie += 1
print(f"{'Model':<20} {'File':<70} {'Score':<10} Win Tie Loose") print(f"{'Model':<20} {'File':<70} {'Score':<10} Win Tie Loose")
print("=" * 20 + " " + "=" * 70 + " " + "=" * 10 + " === === =====") print("=" * 20 + " " + "=" * 70 + " " + "=" * 10 + " === === =====")
print(f"{model1:<20} {best_1['file']:<70} {report_1.score:10.5f}") print(f"{model1:<20} {best_1['file']:<70} {report_1.score:10.5f}")
print( print(
f"{model2:<20} {best_2['file']:<70} " f"{model2:<20} {best_2['file']:<70} "
f"{report_2.score:10.5f} " f"{report_2.score:10.5f} "
f"{TextColor.GREEN}{win:3d} {TextColor.YELLOW}{tie:3d} " f"{TextColor.GREEN}{win:3d} {TextColor.YELLOW}{tie:3d} "
f"{TextColor.RED}{loose:5d}" f"{TextColor.RED}{loose:5d}"
) )
if win_results: if win_results:
print(TextColor.GREEN + "Winners:") print(TextColor.GREEN + "Winners:")
print(winners) print(winners)
if loose_results: if loose_results:
print(TextColor.RED + "Loosers:") print(TextColor.RED + "Loosers:")
print(loosers) print(loosers)

View File

@@ -114,12 +114,13 @@ def default_report():
) )
(file, excel, sql, compare, best, grid, score, model) = parse_arguments() if __name__ == "__main__":
if grid: (file, excel, sql, compare, best, grid, score, model) = parse_arguments()
if grid:
best = False best = False
if file is None and best is None: if file is None and best is None:
default_report() default_report()
else: else:
if best is not None or grid is not None: if best is not None or grid is not None:
report = ReportBest(score, model, best, grid) report = ReportBest(score, model, best, grid)
report.report() report.report()

View File

@@ -40,26 +40,25 @@ def parse_arguments():
) )
( if __name__ == "__main__":
(
score, score,
model, model,
list_results, list_results,
) = parse_arguments() ) = parse_arguments()
all_metrics = ["accuracy", "f1-macro", "f1-micro"]
all_metrics = ["accuracy", "f1-macro", "f1-micro"] metrics = all_metrics if score == "all" else [score]
summary = Summary()
metrics = all_metrics if score == "all" else [score] summary.acquire()
for metric in metrics:
summary = Summary()
summary.acquire()
for metric in metrics:
title = f"BEST RESULT of {metric} for {model}" title = f"BEST RESULT of {metric} for {model}"
best = summary.best_result(criterion="model", value=model, score=metric) best = summary.best_result(
criterion="model", value=model, score=metric
)
summary.show_result(data=best, title=title) summary.show_result(data=best, title=title)
summary.show_result( summary.show_result(
summary.best_result(score=metric), title=f"BEST RESULT of {metric}" summary.best_result(score=metric), title=f"BEST RESULT of {metric}"
) )
summary.show_top(score=metric, n=10) summary.show_top(score=metric, n=10)
if list_results: if list_results:
summary.list_results() summary.list_results()