Recodex judge (#223)

* Updating JudgeBox to use new recodex-token-judge when possible.

* Updating call arguments of judges for better BC.

* Fixing conflict in new judge args.

Author: Martin Kruliš

app/helpers/ExerciseConfig/Pipeline/Box/Boxes/JudgeBox.php

@@ -116,15 +116,27 @@ private function getJudgeBinaryAndArgs(): array {
   // Translation of judge type to command and args. The first item is the default.
   static $judgeTypes = null;
     if ($judgeTypes === null) {
+      // TODO - this is work in progress, a more elaborate way to define recodex-token-judge parameters will be devised soon
+      // TODO - shuffle-rows and shuffle-all versions are not implemented yet in recodex-token-judge
+      // Note: recodex-token-judge is the new judge, which provides more verbose output for the logs
+      $commonArgs = ['--log-limit', '4k', '--ignore-trailing-whitespace'];
+      $commonArgsLineEnds = ['--log-limit', '4k', '--ignore-line-ends'];
       $judgeTypes = [
-        'recodex-judge-normal' => [ConfigParams::$JUDGES_DIR . 'recodex-judge-normal', []],               // default token judge (respecting newlines)
-        'recodex-judge-float' => [ConfigParams::$JUDGES_DIR . 'recodex-judge-normal', ['-r']],            // judge comparing float values with some margin of error
-        'recodex-judge-normal-newline' => [ConfigParams::$JUDGES_DIR . 'recodex-judge-normal', ['-n']],   // default token judge (which treats \n as normal whitespace)
-        'recodex-judge-float-newline' => [ConfigParams::$JUDGES_DIR . 'recodex-judge-normal', ['-rn']],   // judge comparing float values (which treats \n as normal whitespace)
-        'recodex-judge-shuffle' => [ConfigParams::$JUDGES_DIR . 'recodex-judge-shuffle', ['-i']],         // judge ignoring order of tokens on a line
+        'recodex-judge-normal' => [ConfigParams::$JUDGES_DIR . 'recodex-token-judge', $commonArgs],  // default token judge (respecting newlines)
+        'recodex-judge-float' => [ConfigParams::$JUDGES_DIR . 'recodex-token-judge',
+          array_merge($commonArgs, ['--numeric']) ],  // judge comparing float values with some margin of error
+        'recodex-judge-normal-newline' => [ConfigParams::$JUDGES_DIR . 'recodex-token-judge',
+          $commonArgsLineEnds ],  // default token judge (which treats \n as normal whitespace)
+        'recodex-judge-float-newline' => [ConfigParams::$JUDGES_DIR . 'recodex-token-judge',
+          array_merge($commonArgsLineEnds, ['--numeric']) ],  // judge comparing float values (which treats \n as normal whitespace)
+
+        'recodex-judge-shuffle' => [ConfigParams::$JUDGES_DIR . 'recodex-token-judge',
+          array_merge($commonArgs, ['--shuffled-tokens']) ],  // judge ignoring order of tokens on a line
         'recodex-judge-shuffle-rows' => [ConfigParams::$JUDGES_DIR . 'recodex-judge-shuffle', ['-r']],    // judge ignoring order of rows
         'recodex-judge-shuffle-all' => [ConfigParams::$JUDGES_DIR . 'recodex-judge-shuffle', ['-ir']],    // judge ignoring order of tokens on a each line and order of rows
-        'recodex-judge-shuffle-newline' => [ConfigParams::$JUDGES_DIR . 'recodex-judge-shuffle', ['-in']],// judge ignoring order of tokens (which treats \n ...)
+        'recodex-judge-shuffle-newline' => [ConfigParams::$JUDGES_DIR . 'recodex-token-judge',
+          array_merge($commonArgsLineEnds, ['--shuffled-tokens']) ],  // judge ignoring order of tokens (which treats \n ...)
+
         'recodex-judge-passthrough' => [ConfigParams::$JUDGES_DIR . 'recodex-judge-passthrough', []],     // judge which writes its input file (first) to the stdout
         'diff' => ["/usr/bin/diff", []],                                                                  // diff (binary-safe) judge
       ];

tests/ExerciseConfig/Compilation/BaseCompiler.phpt

@@ -434,8 +434,10 @@ class TestBaseCompiler extends Tester\TestCase
     Assert::count(3, $testAJudgeTask->getDependencies());
     Assert::equal([$testACopyTask->getId(), $testARunTask->getId(), $testAMkdir->getId()],
       $testAJudgeTask->getDependencies());
-    Assert::equal(ConfigParams::$JUDGES_DIR . "recodex-judge-normal", $testAJudgeTask->getCommandBinary());
-    Assert::equal([ConfigParams::$EVAL_DIR . "expected.out", ConfigParams::$EVAL_DIR . "actual.out"], $testAJudgeTask->getCommandArguments());
+    Assert::equal(ConfigParams::$JUDGES_DIR . "recodex-token-judge", $testAJudgeTask->getCommandBinary());
+    Assert::equal(["--log-limit", "4k", "--ignore-trailing-whitespace",
+      ConfigParams::$EVAL_DIR . "expected.out", ConfigParams::$EVAL_DIR . "actual.out"],
+      $testAJudgeTask->getCommandArguments());
     Assert::equal(TaskType::$EVALUATION, $testAJudgeTask->getType());
     Assert::equal("testA", $testAJudgeTask->getTestId());
     Assert::notEqual(null, $testAJudgeTask->getSandboxConfig());