snapshot...

modules/deeplearning/srcnn_cld_frac.py

@@ -968,11 +968,16 @@ def analyze(file='/Users/tomrink/cld_opd_frac.npy'):
     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))
 
-    print(recall_0, precision_0, mcc_0)
-    print(recall_1, precision_1, mcc_1)
-    print(recall_2, precision_2, mcc_2)
+    acc_0 = np.sum(lbls_0_1 == pred_0_1)/pred_0_1.size
+    acc_1 = np.sum(lbls_1_2 == pred_1_2)/pred_1_2.size
+    acc_2 = np.sum(lbls_0_2 == pred_0_2)/pred_0_2.size
 
-    return cm_0_1, cm_1_2, cm_0_2
+    print(acc_0, recall_0, precision_0, mcc_0)
+    print(acc_1, recall_1, precision_1, mcc_1)
+    print(acc_2, recall_2, precision_2, mcc_2)
+
+    return cm_0_1, cm_1_2, cm_0_2, [acc_0, acc_1, acc_2], [recall_0, recall_1, recall_2],\
+        [precision_0, precision_1, precision_2], [mcc_0, mcc_1, mcc_2]
 
 
 if __name__ == "__main__":