grader: Show percentage instead of points when appropriate

ia-toki · Aug 12, 2024 · ea4169a · ea4169a
1 parent 68fa199
commit ea4169a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/...kends/judgels-grader-engines/src/main/java/judgels/gabriel/aggregators/MinAggregator.java b/...kends/judgels-grader-engines/src/main/java/judgels/gabriel/aggregators/MinAggregator.java
@@ -21,16 +21,17 @@ public AggregationResult aggregate(List<TestCaseVerdict> testCaseVerdicts, doubl
                 aggregatedVerdict = verdict;
             }
 
-            String points;
+            String points = "";
             if (verdict == Verdict.OK) {
                 double okPoints = 0.0;
                 if (testCaseVerdict.getPercentage().isPresent()) {
                     okPoints = testCaseVerdict.getPercentage().get() * subtaskPoints / 100.0;
+                    points = testCaseVerdict.getPercentage().get() + "%";
                 } else if (testCaseVerdict.getPoints().isPresent()) {
                     okPoints = testCaseVerdict.getPoints().get();
+                    points = "" + okPoints;
                 }
                 aggregatedPoints = Math.min(aggregatedPoints, okPoints);
-                points = "" + okPoints;
             } else if (verdict == Verdict.ACCEPTED) {
                 points = "*";
             } else if (verdict == Verdict.SKIPPED) {

diff --git a/.../judgels-grader-engines/src/test/java/judgels/gabriel/aggregators/MinAggregatorTests.java b/.../judgels-grader-engines/src/test/java/judgels/gabriel/aggregators/MinAggregatorTests.java
@@ -87,7 +87,7 @@ void aggregate_min_ok_percentage() {
 
         AggregationResult result = aggregator.aggregate(testCaseVerdicts, 70.0);
         assertThat(result.getSubtaskVerdict()).isEqualTo(SubtaskVerdict.of(Verdict.OK, 17.5));
-        assertThat(result.getTestCasePoints()).containsExactly("*", "17.5", "35.0");
+        assertThat(result.getTestCasePoints()).containsExactly("*", "25%", "50%");
     }
 
     @Test