diff --git a/modules/deeplearning/icing_cnn.py b/modules/deeplearning/icing_cnn.py index c8d9ff479143d29ecc87c713bbe0fe2e267732bf..84fa53f9fd3b2c0730b3075dcb216bd20cf202e0 100644 --- a/modules/deeplearning/icing_cnn.py +++ b/modules/deeplearning/icing_cnn.py @@ -914,15 +914,16 @@ class IcingIntensityNN: ckpt.restore(ckpt_manager.latest_checkpoint) - self.test_loss.reset_states() - self.test_accuracy.reset_states() + self.reset_test_metrics() for data0, data1, label in self.test_dataset: ds = tf.data.Dataset.from_tensor_slices((data0, data1, label)) ds = ds.batch(BATCH_SIZE) for mini_batch_test in ds: self.predict(mini_batch_test) - print('loss, acc: ', self.test_loss.result(), self.test_accuracy.result()) + f1, mcc = self.get_metrics() + print('loss, acc: ', self.test_loss.result().numpy(), self.test_accuracy.result().numpy(), self.test_recall.result().numpy(), + self.test_precision.result().numpy(), self.test_auc.result().numpy(), f1.numpy(), mcc.numpy()) labels = np.concatenate(self.test_labels) self.test_labels = labels