diff --git a/modules/icing/pirep_goes.py b/modules/icing/pirep_goes.py
index 5e901b162ffcdf13e07011255c20db246b991af2..9094c87544f5ac1241b8d3c925b745fbc6eaa2d0 100644
--- a/modules/icing/pirep_goes.py
+++ b/modules/icing/pirep_goes.py
@@ -2589,16 +2589,16 @@ def analyze(preds_file, labels, prob_avg, test_file):
iint = np.where(iint == -1, 0, iint)
iint = np.where(iint != 0, 1, iint)
- nda[np.logical_and(nda >= 100, nda < 5000)] = 0
- nda[np.logical_and(nda >= 5000, nda < 15000)] = 1
+ nda[np.logical_and(nda >= 100, nda < 4000)] = 0
+ nda[np.logical_and(nda >= 4000, nda < 15000)] = 1
nda[np.logical_and(nda >= 15000, nda < 20000)] = 2
- # nda[np.logical_and(nda >= 6000, nda < 8000)] = 3
+ nda[np.logical_and(nda >= 20000, nda < 25000)] = 3
# nda[np.logical_and(nda >= 8000, nda < 15000)] = 4
print(np.sum(nda == 0), np.sum(nda == 1), np.sum(nda == 2))
- print('No icing: ', np.sum((iint == 0) & (nda == 0)), np.sum((iint == 0) & (nda == 1)), np.sum((iint == 0) & (nda == 2)))
+ print('No icing: ', np.sum((iint == 0) & (nda == 0)), np.sum((iint == 0) & (nda == 1)), np.sum((iint == 0) & (nda == 2)), np.sum((iint == 0) & (nda == 3)))
print('---------------------------')
- print('Icing: ', np.sum((iint == 1) & (nda == 0)), np.sum((iint == 1) & (nda == 1)), np.sum((iint == 1) & (nda == 2)))
+ print('Icing: ', np.sum((iint == 1) & (nda == 0)), np.sum((iint == 1) & (nda == 1)), np.sum((iint == 1) & (nda == 2)), np.sum((iint == 1) & (nda == 3)))
print('---------------------------')
print('----------------------------------------------------------')
@@ -2612,6 +2612,7 @@ def analyze(preds_file, labels, prob_avg, test_file):
num_0 = np.sum(nda == 0)
num_1 = np.sum(nda == 1)
num_2 = np.sum(nda == 2)
+ num_3 = np.sum(nda == 3)
true_ice = (labels == 1) & (preds == 1)
false_ice = (labels == 0) & (preds == 1)
@@ -2622,52 +2623,66 @@ def analyze(preds_file, labels, prob_avg, test_file):
tp_0 = np.sum(true_ice & (nda == 0))
tp_1 = np.sum(true_ice & (nda == 1))
tp_2 = np.sum(true_ice & (nda == 2))
+ tp_3 = np.sum(true_ice & (nda == 3))
tn_0 = np.sum(true_no_ice & (nda == 0))
tn_1 = np.sum(true_no_ice & (nda == 1))
tn_2 = np.sum(true_no_ice & (nda == 2))
+ tn_3 = np.sum(true_no_ice & (nda == 3))
fp_0 = np.sum(false_ice & (nda == 0))
fp_1 = np.sum(false_ice & (nda == 1))
fp_2 = np.sum(false_ice & (nda == 2))
+ fp_3 = np.sum(false_ice & (nda == 3))
fn_0 = np.sum(false_no_ice & (nda == 0))
fn_1 = np.sum(false_no_ice & (nda == 1))
fn_2 = np.sum(false_no_ice & (nda == 2))
+ fn_3 = np.sum(false_no_ice & (nda == 3))
recall_0 = tp_0 / (tp_0 + fn_0)
recall_1 = tp_1 / (tp_1 + fn_1)
recall_2 = tp_2 / (tp_2 + fn_2)
+ recall_3 = tp_3 / (tp_3 + fn_3)
precision_0 = tp_0 / (tp_0 + fp_0)
precision_1 = tp_1 / (tp_1 + fp_1)
precision_2 = tp_2 / (tp_2 + fp_2)
+ precision_3 = tp_3 / (tp_3 + fp_3)
+
+ f1_0 = 2 * (precision_0 * recall_0) / (precision_0 + recall_0)
+ f1_1 = 2 * (precision_1 * recall_1) / (precision_1 + recall_1)
+ f1_2 = 2 * (precision_2 * recall_2) / (precision_2 + recall_2)
+ f1_3 = 2 * (precision_3 * recall_3) / (precision_3 + recall_3)
mcc_0 = ((tp_0 * tn_0) - (fp_0 * fn_0)) / np.sqrt((tp_0 + fp_0) * (tp_0 + fn_0) * (tn_0 + fp_0) * (tn_0 + fn_0))
mcc_1 = ((tp_1 * tn_1) - (fp_1 * fn_1)) / np.sqrt((tp_1 + fp_1) * (tp_1 + fn_1) * (tn_1 + fp_1) * (tn_1 + fn_1))
mcc_2 = ((tp_2 * tn_2) - (fp_2 * fn_2)) / np.sqrt((tp_2 + fp_2) * (tp_2 + fn_2) * (tn_2 + fp_2) * (tn_2 + fn_2))
+ mcc_3 = ((tp_3 * tn_3) - (fp_3 * fn_3)) / np.sqrt((tp_3 + fp_3) * (tp_3 + fn_3) * (tn_3 + fp_3) * (tn_3 + fn_3))
acc_0 = np.sum(labels[nda == 0] == preds[nda == 0]) / num_0
acc_1 = np.sum(labels[nda == 1] == preds[nda == 1]) / num_1
acc_2 = np.sum(labels[nda == 2] == preds[nda == 2]) / num_2
+ acc_3 = np.sum(labels[nda == 3] == preds[nda == 3]) / num_3
print('Total (Positive/Icing Prediction: ')
- print('True icing: ', np.sum(true_ice & (nda == 0)), np.sum(true_ice & (nda == 1)), np.sum(true_ice & (nda == 2)))
+ print('True icing: ', np.sum(true_ice & (nda == 0)), np.sum(true_ice & (nda == 1)), np.sum(true_ice & (nda == 2)), np.sum(true_ice & (nda == 3)))
print('-------------------------')
- print('False no icing (False Negative/Miss): ', np.sum(false_no_ice & (nda == 0)), np.sum(false_no_ice & (nda == 1)), np.sum(false_no_ice & (nda == 2)))
+ print('False no icing (False Negative/Miss): ', np.sum(false_no_ice & (nda == 0)), np.sum(false_no_ice & (nda == 1)), np.sum(false_no_ice & (nda == 2)), np.sum(false_no_ice & (nda == 3)))
print('---------------------------------------------------')
print('---------------------------------------------------')
print('Total (Negative/No Icing Prediction: ')
- print('True no icing: ', np.sum(true_no_ice & (nda == 0)), np.sum(true_no_ice & (nda == 1)), np.sum(true_no_ice & (nda == 2)))
+ print('True no icing: ', np.sum(true_no_ice & (nda == 0)), np.sum(true_no_ice & (nda == 1)), np.sum(true_no_ice & (nda == 2)), np.sum(true_no_ice & (nda == 3)))
print('-------------------------')
- print('* False icing (False Positive/False Alarm) *: ', np.sum(false_ice & (nda == 0)), np.sum(false_ice & (nda == 1)), np.sum(false_ice & (nda == 2)))
+ print('* False icing (False Positive/False Alarm) *: ', np.sum(false_ice & (nda == 0)), np.sum(false_ice & (nda == 1)), np.sum(false_ice & (nda == 2)), np.sum(false_ice & (nda == 3)))
print('-------------------------')
- print('ACC: ', acc_0, acc_1, acc_2)
- print('Recall: ', recall_0, recall_1, recall_2)
- print('Precision: ', precision_0, precision_1, precision_2)
- print('MCC: ', mcc_0, mcc_1, mcc_2)
+ print('ACC: ', acc_0, acc_1, acc_2, acc_3)
+ print('Recall: ', recall_0, recall_1, recall_2, recall_3)
+ print('Precision: ', precision_0, precision_1, precision_2, precision_3)
+ print('F1: ', f1_0, f1_1, f1_2, f1_3)
+ print('MCC: ', mcc_0, mcc_1, mcc_2, mcc_3)
return labels[nda == 0], prob_avg[nda == 0], labels[nda == 1], prob_avg[nda == 1], labels[nda == 2], prob_avg[nda == 2]