grader: Beautify score output

ia-toki · Aug 16, 2024 · d94fb7a · d94fb7a
1 parent 7e81e98
commit d94fb7a
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 17 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
@@ -26,20 +26,20 @@ public AggregationResult aggregate(List<TestCaseVerdict> testCaseVerdicts, doubl
                 double okPoints = 0.0;
                 if (testCaseVerdict.getPercentage().isPresent()) {
                     okPoints = testCaseVerdict.getPercentage().get() * subtaskPoints / 100.0;
-                    points = testCaseVerdict.getPercentage().get() + "%";
+                    points = PointUtils.formatPoints(testCaseVerdict.getPercentage().get()) + "%";
                 } else if (testCaseVerdict.getPoints().isPresent()) {
                     okPoints = testCaseVerdict.getPoints().get();
-                    points = "" + okPoints;
+                    points = PointUtils.formatPoints(okPoints);
                 }
                 aggregatedPoints = Math.min(aggregatedPoints, okPoints);
             } else if (verdict == Verdict.ACCEPTED) {
-                points = "*";
+                points = "✓";
             } else if (verdict == Verdict.SKIPPED) {
                 aggregatedPoints = 0.0;
                 points = "?";
             } else {
                 aggregatedPoints = 0.0;
-                points = "X";
+                points = "✕";
             }
 
             testCasePoints.add(points);

diff --git a/...backends/judgels-grader-engines/src/main/java/judgels/gabriel/aggregators/PointUtils.java b/...backends/judgels-grader-engines/src/main/java/judgels/gabriel/aggregators/PointUtils.java
@@ -0,0 +1,18 @@
+package judgels.gabriel.aggregators;
+
+public class PointUtils {
+    private PointUtils() {}
+
+    public static String formatPoints(double pts) {
+        String result = "" + pts;
+        if (result.contains(".")) {
+            while (result.charAt(result.length() - 1) == '0') {
+                result = result.substring(0, result.length() - 1);
+            }
+            if (result.charAt(result.length() - 1) == '.') {
+                result = result.substring(0, result.length() - 1);
+            }
+        }
+        return result;
+    }
+}
diff --git a/...kends/judgels-grader-engines/src/main/java/judgels/gabriel/aggregators/SumAggregator.java b/...kends/judgels-grader-engines/src/main/java/judgels/gabriel/aggregators/SumAggregator.java
@@ -37,7 +37,7 @@ public AggregationResult aggregate(List<TestCaseVerdict> testCaseVerdicts, doubl
             }
             aggregatedPoints += points;
 
-            testCasePoints.add("" + points);
+            testCasePoints.add(PointUtils.formatPoints(points));
         }
         if (aggregatedVerdict == Verdict.SKIPPED) {
             aggregatedVerdict = Verdict.OK;

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
@@ -27,7 +27,7 @@ void aggregate_full_points() {
 
         AggregationResult result = aggregator.aggregate(testCaseVerdicts, 70.0);
         assertThat(result.getSubtaskVerdict()).isEqualTo(SubtaskVerdict.of(Verdict.ACCEPTED, 70.0));
-        assertThat(result.getTestCasePoints()).containsExactly("*", "*");
+        assertThat(result.getTestCasePoints()).containsExactly("✓", "✓");
     }
 
     @Test
@@ -39,7 +39,7 @@ void aggregate_zero_points() {
 
         AggregationResult result = aggregator.aggregate(testCaseVerdicts, 70.0);
         assertThat(result.getSubtaskVerdict()).isEqualTo(SubtaskVerdict.of(Verdict.RUNTIME_ERROR, 0.0));
-        assertThat(result.getTestCasePoints()).containsExactly("*", "X", "X");
+        assertThat(result.getTestCasePoints()).containsExactly("✓", "✕", "✕");
     }
 
     @Test
@@ -51,7 +51,7 @@ void aggregate_zero_points_with_skipped() {
 
         AggregationResult result = aggregator.aggregate(testCaseVerdicts, 70.0);
         assertThat(result.getSubtaskVerdict()).isEqualTo(SubtaskVerdict.of(Verdict.RUNTIME_ERROR, 0.0));
-        assertThat(result.getTestCasePoints()).containsExactly("*", "X", "?");
+        assertThat(result.getTestCasePoints()).containsExactly("✓", "✕", "?");
     }
 
     @Test
@@ -63,19 +63,19 @@ void aggregate_zero_points_with_accepted_and_skipped() {
 
         AggregationResult result = aggregator.aggregate(testCaseVerdicts, 70.0);
         assertThat(result.getSubtaskVerdict()).isEqualTo(SubtaskVerdict.of(Verdict.OK, 0.0));
-        assertThat(result.getTestCasePoints()).containsExactly("*", "*", "?");
+        assertThat(result.getTestCasePoints()).containsExactly("✓", "✓", "?");
     }
 
     @Test
     void aggregate_min_ok_points() {
         List<TestCaseVerdict> testCaseVerdicts = ImmutableList.of(
                 new TestCaseVerdict.Builder().verdict(Verdict.ACCEPTED).build(),
-                new TestCaseVerdict.Builder().verdict(Verdict.OK).points(20.0).build(),
+                new TestCaseVerdict.Builder().verdict(Verdict.OK).points(20.5).build(),
                 new TestCaseVerdict.Builder().verdict(Verdict.OK).points(30.0).build());
 
         AggregationResult result = aggregator.aggregate(testCaseVerdicts, 70.0);
-        assertThat(result.getSubtaskVerdict()).isEqualTo(SubtaskVerdict.of(Verdict.OK, 20.0));
-        assertThat(result.getTestCasePoints()).containsExactly("*", "20.0", "30.0");
+        assertThat(result.getSubtaskVerdict()).isEqualTo(SubtaskVerdict.of(Verdict.OK, 20.5));
+        assertThat(result.getTestCasePoints()).containsExactly("✓", "20.5", "30");
     }
 
     @Test
@@ -87,7 +87,7 @@ void aggregate_min_ok_percentage() {
 
         AggregationResult result = aggregator.aggregate(testCaseVerdicts, 70.0);
         assertThat(result.getSubtaskVerdict()).isEqualTo(SubtaskVerdict.of(Verdict.OK, 8.75));
-        assertThat(result.getTestCasePoints()).containsExactly("*", "12.5%", "50.0%");
+        assertThat(result.getTestCasePoints()).containsExactly("✓", "12.5%", "50%");
     }
 
     @Test

diff --git a/.../judgels-grader-engines/src/test/java/judgels/gabriel/aggregators/SumAggregatorTests.java b/.../judgels-grader-engines/src/test/java/judgels/gabriel/aggregators/SumAggregatorTests.java
@@ -27,7 +27,7 @@ void aggregate_full_points() {
 
         AggregationResult result = aggregator.aggregate(testCaseVerdicts, 100.0);
         assertThat(result.getSubtaskVerdict()).isEqualTo(SubtaskVerdict.of(Verdict.ACCEPTED, 100.0));
-        assertThat(result.getTestCasePoints()).containsExactly("50.0", "50.0");
+        assertThat(result.getTestCasePoints()).containsExactly("50", "50");
     }
 
     @Test
@@ -40,7 +40,7 @@ void aggregate_partial_points() {
 
         AggregationResult result = aggregator.aggregate(testCaseVerdicts, 100.0);
         assertThat(result.getSubtaskVerdict()).isEqualTo(SubtaskVerdict.of(Verdict.TIME_LIMIT_EXCEEDED, 55.0));
-        assertThat(result.getTestCasePoints()).containsExactly("25.0", "0.0", "30.0", "0.0");
+        assertThat(result.getTestCasePoints()).containsExactly("25", "0", "30", "0");
     }
 
     @Test
@@ -53,7 +53,7 @@ void aggregate_partial_points_with_skipped() {
 
         AggregationResult result = aggregator.aggregate(testCaseVerdicts, 100.0);
         assertThat(result.getSubtaskVerdict()).isEqualTo(SubtaskVerdict.of(Verdict.TIME_LIMIT_EXCEEDED, 50.0));
-        assertThat(result.getTestCasePoints()).containsExactly("25.0", "25.0", "0.0", "0.0");
+        assertThat(result.getTestCasePoints()).containsExactly("25", "25", "0", "0");
     }
 
     @Test
@@ -66,7 +66,7 @@ void aggregate_partial_points_with_accepted_and_skipped() {
 
         AggregationResult result = aggregator.aggregate(testCaseVerdicts, 100.0);
         assertThat(result.getSubtaskVerdict()).isEqualTo(SubtaskVerdict.of(Verdict.OK, 50.0));
-        assertThat(result.getTestCasePoints()).containsExactly("25.0", "25.0", "0.0", "0.0");
+        assertThat(result.getTestCasePoints()).containsExactly("25", "25", "0", "0");
     }
 
     @Test