Add pracdemo stage for pracdemo marking

Author: BraeWebb

src/main/java/chalkbox/commands/Grade.java

@@ -84,6 +84,7 @@ private Stage getStage(String name, Config config) {
             case "codestyle" -> config.toCodestyle();
             case "conformance" -> config.toConformance();
             case "functionality" -> config.toFunctionality();
+            case "pracdemo" -> config.toPracDemo();
             case "mutation" -> config.toMutation();
             case "tlc" -> config.toTLC();
             default -> null;

src/main/java/chalkbox/commands/PracDemo.java

@@ -0,0 +1,41 @@
+package chalkbox.commands;
+
+import chalkbox.config.Config;
+import chalkbox.stages.StageException;
+import com.google.common.flogger.FluentLogger;
+import picocli.CommandLine.Command;
+import picocli.CommandLine.Mixin;
+
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+@Command(name = "pracdemo",
+        description = "Runs practical demonstration marking")
+public class PracDemo implements Runnable {
+    private static final FluentLogger logger = FluentLogger.forEnclosingClass();
+
+    @Mixin Shared shared = new Shared();
+
+    @Override
+    public void run() {
+        Path configFile = Paths.get(shared.configFile);
+        var config = new Config(configFile);
+
+        var solution = config.toSolution();
+        var submission = config.toSubmission();
+        var stage = config.toPracDemo();
+        try {
+            var result = stage.run(submission, solution);
+            logger.atInfo().log("Practical Demonstration Run");
+            logger.atInfo().log(result.overview().getOutput());
+            for (var inner : result.results()) {
+                logger.atInfo().log(inner.getOutput());
+            }
+        } catch (StageException e) {
+            logger.atSevere().log(e.toString());
+            System.exit(0);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+}

src/main/java/chalkbox/commands/Run.java

@@ -5,7 +5,7 @@
 
 @Command(name = "run",
         description = "Run one of the supported commands: CheckStyle, Conformance, Functionality, Mutation",
-        subcommands = { Grade.class, Conformance.class, CodeStyle.class, Functionality.class, Mutation.class, TLC.class, CommandLine.HelpCommand.class })
+        subcommands = { Grade.class, Conformance.class, CodeStyle.class, Functionality.class, PracDemo.class, Mutation.class, TLC.class, CommandLine.HelpCommand.class })
 public class Run implements Runnable {
 
     @Override

src/main/java/chalkbox/config/Config.java

@@ -7,6 +7,7 @@
 import chalkbox.stages.codestyle.CodeStyle;
 import chalkbox.stages.conformance.Conformance;
 import chalkbox.stages.mutation.Mutation;
+import chalkbox.stages.pracdemos.PracDemo;
 import chalkbox.stages.tlc.TLC;
 import org.github.gestalt.config.Gestalt;
 import org.github.gestalt.config.builder.GestaltBuilder;
@@ -76,6 +77,14 @@ public Functionality toFunctionality() throws ConfigException {
         }
     }
 
+    public PracDemo toPracDemo() throws ConfigException {
+        return new PracDemo(
+                gestalt.getConfig("pracdemo.weighting", 100.0, Double.class),
+                gestalt.getConfig("pracdemo.showPassing", true, Boolean.class),
+                gestalt.getConfig("pracdemo.allVisible", false, Boolean.class)
+        );
+    }
+
     public Mutation toMutation() throws ConfigException {
         try {
             return new Mutation(

src/main/java/chalkbox/stages/pracdemos/PracDemo.java

@@ -10,11 +10,19 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.*;
 
+/**
+ * The practical demonstration stage differs from the Functionality stage
+ * in that test classes are read from a tasks file included in the submission
+ * as each student will have a different subset of test classes.
+ */
+// TODO: This should really share as much of Functionality as possible
 public class PracDemo implements Stage {
 
-    public final static String name = "Functionality";
+    public final static String name = "PracDemo";
 
     private final double maxScore;
     private final boolean showPassing;
@@ -104,10 +112,16 @@ public StageResult run(Submission submission, Solution solution) throws StageExc
         var totalNumTests = 0;
         var innerResults = new ArrayList<Result>();
         var classResults = new ArrayList<ClassResult>();
-        for (String className : tests) {
-            if (!className.endsWith("Test")) {
-                continue;
-            }
+
+        List<String> testNames;
+        try {
+            Path taskFile = Path.of(submission.getBasePath() + "/tasks");
+            testNames = Files.readAllLines(taskFile);
+        } catch (IOException e) {
+            throw new StageException("Unable to find tasks file");
+        }
+        for (String className : testNames) {
+            className = "demos." + className + "Test";
 
             int classPassing = 0;
 
@@ -171,9 +185,10 @@ public StageResult run(Submission submission, Solution solution) throws StageExc
         }
         double scaled = Math.ceil((total / possible) * maxScore);
 
-        var equation = "\n$$\n\\dfrac{" + String.format("%.3f", total) + "}{" + possible + "} \\times " + maxScore + " = " + scaled + "\n$$";
+        //var equation = "\n$$\n\\dfrac{" + String.format("%.3f", total) + "}{" + possible + "} \\times " + maxScore + " = " + scaled + "\n$$";
+        var equation = "\n$$sum = "+total+"$$";
         var overview = new Result(name);
-        overview.setScore(scaled)
+        overview.setScore(total)
                 .setMaxScore(maxScore)
                 .appendOutput(table + equation)
                 .setOutputFormat("md")