From 32903acde6a8e3bdc4c58e739453b9820395d4f9 Mon Sep 17 00:00:00 2001
From: Simon Will <will@cl.uni-heidelberg.de>
Date: Fri, 26 Mar 2021 22:58:07 +0100
Subject: [PATCH] Add model column to evaluation result table

---
 joeynmt_server/models/evaluation_results.py |  1 +
 joeynmt_server/trainer.py                   | 10 ++++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/joeynmt_server/models/evaluation_results.py b/joeynmt_server/models/evaluation_results.py
index a2f6391..799e948 100644
--- a/joeynmt_server/models/evaluation_results.py
+++ b/joeynmt_server/models/evaluation_results.py
@@ -7,6 +7,7 @@ class EvaluationResult(BaseModel):
     __tablename__ = 'evaluation_results'
 
     label = db.Column(db.Unicode(50), nullable=False)
+    model = db.Column(db.Unicode(500), nullable=False)
     correct = db.Column(db.Integer, nullable=False)
     total = db.Column(db.Integer, nullable=False)
 
diff --git a/joeynmt_server/trainer.py b/joeynmt_server/trainer.py
index d627b44..6c72dc4 100644
--- a/joeynmt_server/trainer.py
+++ b/joeynmt_server/trainer.py
@@ -175,8 +175,10 @@ def train_n_rounds(config_basename, min_rounds=10):
                 correct = round(accuracy * total)
                 logging.info('Got validation result: {}/{} = {}.'
                              .format(correct, total, accuracy))
-                evr = EvaluationResult(label='running_dev', correct=correct,
-                                       total=total)
+                evr = EvaluationResult(
+                    label='running_dev', model=config_basename,
+                    correct=correct, total=total
+                )
                 db.session.add(evr)
                 db.session.commit()
                 logging.info('Saving parses from running dev set.')
@@ -242,8 +244,8 @@ def validate(config_basename, dataset_name='dev'):
         correct = round(accuracy * total)
         logging.info('Got validation result: {}/{} = {}.'
                      .format(correct, total, accuracy))
-        evr = EvaluationResult(label=dataset_name, correct=correct,
-                               total=total)
+        evr = EvaluationResult(label=dataset_name, model=config_basename,
+                               correct=correct, total=total)
         db.session.add(evr)
         db.session.commit()
     except:
-- 
GitLab