From 62aaa1cfab340045db13bda04c1414522268276b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timur=20Sa=C4=9Flam?= Date: Tue, 25 Jun 2024 12:26:31 +0200 Subject: [PATCH 1/3] Fix a bug where the basecode submission was not normalized. --- core/src/main/java/de/jplag/SubmissionSet.java | 1 + 1 file changed, 1 insertion(+) diff --git a/core/src/main/java/de/jplag/SubmissionSet.java b/core/src/main/java/de/jplag/SubmissionSet.java index f958bb638..5297a8902 100644 --- a/core/src/main/java/de/jplag/SubmissionSet.java +++ b/core/src/main/java/de/jplag/SubmissionSet.java @@ -99,6 +99,7 @@ public List getInvalidSubmissions() { } public void normalizeSubmissions() { + baseCodeSubmission.normalize(); ProgressBarLogger.iterate(ProgressBarType.TOKEN_STRING_NORMALIZATION, submissions, Submission::normalize); } From 4155d75a02a96e358c94086ed5314313e3d901bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timur=20Sa=C4=9Flam?= Date: Tue, 25 Jun 2024 12:30:23 +0200 Subject: [PATCH 2/3] Only normalize basecode submission if it actually exists. --- core/src/main/java/de/jplag/SubmissionSet.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/de/jplag/SubmissionSet.java b/core/src/main/java/de/jplag/SubmissionSet.java index 5297a8902..e062b8203 100644 --- a/core/src/main/java/de/jplag/SubmissionSet.java +++ b/core/src/main/java/de/jplag/SubmissionSet.java @@ -99,7 +99,9 @@ public List getInvalidSubmissions() { } public void normalizeSubmissions() { - baseCodeSubmission.normalize(); + if(baseCodeSubmission != null) { + baseCodeSubmission.normalize(); + } ProgressBarLogger.iterate(ProgressBarType.TOKEN_STRING_NORMALIZATION, submissions, Submission::normalize); } From 03f1174c206648b7388d230caf39e59669c5b5a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timur=20Sa=C4=9Flam?= Date: Tue, 25 Jun 2024 12:33:30 +0200 Subject: [PATCH 3/3] Spotless. --- core/src/main/java/de/jplag/SubmissionSet.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/java/de/jplag/SubmissionSet.java b/core/src/main/java/de/jplag/SubmissionSet.java index e062b8203..743d32b2e 100644 --- a/core/src/main/java/de/jplag/SubmissionSet.java +++ b/core/src/main/java/de/jplag/SubmissionSet.java @@ -99,7 +99,7 @@ public List getInvalidSubmissions() { } public void normalizeSubmissions() { - if(baseCodeSubmission != null) { + if (baseCodeSubmission != null) { baseCodeSubmission.normalize(); } ProgressBarLogger.iterate(ProgressBarType.TOKEN_STRING_NORMALIZATION, submissions, Submission::normalize);