Fix errors

wenhui-prudencemed · Jan 18, 2017 · 2be11f6 · 2be11f6
1 parent 6139b7e
commit 2be11f6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/ecg/eval-keras.py b/ecg/eval-keras.py
@@ -27,15 +27,15 @@
     y_val_flat = np.argmax(y_val, axis=-1).flatten().tolist()
     predictions_flat = np.argmax(predictions, axis=-1).flatten().tolist()
 
-    print(classification_report(
-        y_val_flat, predictions_flat,
-        target_names=dl.classes))
+    cnf_matrix = confusion_matrix(y_val_flat, predictions_flat).tolist()
+    for i, row in enumerate(cnf_matrix):
+        row.insert(0, dl.classes[i])
 
     y_val_flat.extend(range(len(dl.classes)))
     predictions_flat.extend(range(len(dl.classes)))
 
-    cnf_matrix = confusion_matrix(y_val_flat, predictions_flat).tolist()
-    for i, row in enumerate(cnf_matrix):
-        row.insert(0, dl.classes[i])
+    print(classification_report(
+        y_val_flat, predictions_flat,
+        target_names=dl.classes))
 
     print(tabulate(cnf_matrix, headers=[c[:1] for c in dl.classes]))
diff --git a/ecg/train-keras.py b/ecg/train-keras.py
@@ -20,7 +20,7 @@ def get_folder_name(start_time, net_type):
 
 def get_filename_for_saving(start_time, net_type):
     saved_filename = get_folder_name(start_time, net_type) + \
-        "/{val_loss:.3f}-{val_acc.3f}-{epoch:002d}-{loss.3f}-{acc.3f}.hdf5"
+        "/{val_loss:.3f}-{val_acc:.3f}-{epoch:002d}-{loss:.3f}-{acc:.3f}.hdf5"
     return saved_filename