2martens/masterthesis
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Unified naming of evaluation results

Browse Source 
Signed-off-by: Jim Martens <github@2martens.de>
This commit is contained in:
Jim Martens
2019-09-04 12:12:30 +02:00
parent 0ae13a2fba
commit eef8839657
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/twomartens/masterthesis/cli.py
View File

@ -364,16 +364,16 @@ def _ssd_evaluate_entropy_loop(conf_obj: conf.Config, paths: AttributeDict,
results = _ssd_evaluate_get_results(true_positives=true_positives, results = _ssd_evaluate_get_results(true_positives=true_positives,
false_positives=false_positives, false_positives=false_positives,
cum_true_positives=cum_true_positives, cumulative_true_positives=cum_true_positives,
cum_false_positives=cum_false_positives, cumulative_false_positives=cum_false_positives,
cum_true_positives_overall=cum_true_positives_overall, cumulative_true_positives_overall=cum_true_positives_overall,
cum_false_positives_overall=cum_false_positives_overall, cumulative_false_positives_overall=cum_false_positives_overall,
cum_precisions=cum_precisions, cumulative_precisions=cum_precisions,
cum_recalls=cum_recalls, cumulative_recalls=cum_recalls,
cum_precisions_micro=cum_precisions_micro, cumulative_precisions_micro=cum_precisions_micro,
cum_recalls_micro=cum_recalls_micro, cumulative_recalls_micro=cum_recalls_micro,
cum_precisions_macro=cum_precisions_macro, cumulative_precisions_macro=cum_precisions_macro,
cum_recalls_macro=cum_recalls_macro, cumulative_recalls_macro=cum_recalls_macro,
f1_scores=f1_scores, f1_scores=f1_scores,
f1_scores_micro=f1_scores_micro, f1_scores_micro=f1_scores_micro,
f1_scores_macro=f1_scores_macro, f1_scores_macro=f1_scores_macro,
@ -460,14 +460,14 @@ def _visualise_metrics(visualise_precision_recall: callable,
else f"{metrics_file}.bin", "rb") as file: else f"{metrics_file}.bin", "rb") as file:
metrics = pickle.load(file) metrics = pickle.load(file)
precision_micro = metrics["cumulative_precision_micro"] precision_micro = metrics["cumulative_precisions_micro"]
recall_micro = metrics["cumulative_recall_micro"] recall_micro = metrics["cumulative_recalls_micro"]
visualise_precision_recall(precision_micro, recall_micro, visualise_precision_recall(precision_micro, recall_micro,
output_path, f"micro-{threshold}" output_path, f"micro-{threshold}"
if use_entropy_threshold else "micro") if use_entropy_threshold else "micro")
precision_macro = metrics["cumulative_precision_macro"] precision_macro = metrics["cumulative_precisions_macro"]
recall_macro = metrics["cumulative_recall_macro"] recall_macro = metrics["cumulative_recalls_macro"]
visualise_precision_recall(precision_macro, recall_macro, visualise_precision_recall(precision_macro, recall_macro,
output_path, f"macro-{threshold}" output_path, f"macro-{threshold}"
if use_entropy_threshold else "macro") if use_entropy_threshold else "macro")