Merge branch 'master' into release-0.8.1

# Conflicts: # .github/workflows/ci-build-manual-crf.yml
kermitt2 · Aug 30, 2024 · 5b045af · 5b045af
2 parents 7025697 + 399ef9d
commit 5b045af
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/.github/workflows/ci-build-manual-crf.yml b/.github/workflows/ci-build-manual-crf.yml
@@ -42,7 +42,6 @@ jobs:
           registry: docker.io
           pushImage: true
           tags:  |
-            latest-develop${{ github.event.inputs.suffix && '-' + github.event.inputs.suffix || '' }}
-            latest-crf${{ github.event.inputs.suffix && '-' + github.event.inputs.suffix || '' }}
+            latest-develop${{ github.event.inputs.suffix != '' && '-' || '' }}${{ github.event.inputs.suffix }}, latest-crf${{ github.event.inputs.suffix != '' && '-' || '' }}${{ github.event.inputs.suffix }}
       - name: Image digest
         run: echo ${{ steps.docker_build.outputs.digest }}
diff --git a/grobid-trainer/src/main/java/org/grobid/trainer/AbstractTrainer.java b/grobid-trainer/src/main/java/org/grobid/trainer/AbstractTrainer.java
@@ -171,6 +171,10 @@ public String splitTrainEvaluate(Double split, boolean incremental) {
         // if we are here, that means that training succeeded
         renameModels(oldModelPath, tempModelPath);
 
+        if (split == 1.0) {
+            return "Split ratio is 1.0, no evaluation performed.";
+        }
+
         return EvaluationUtilities.evaluateStandard(evalDataPath.getAbsolutePath(), getTagger()).toString();
     }