Skip to content

Create verdict groups that selectively can be used #2856

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 25, 2024
Merged

Create verdict groups that selectively can be used #2856

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 20 additions & 8 deletions etc/verdicts.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,24 @@
// CCS specification (and a few more common ones) at:
// https://ccs-specs.icpc.io/2021-11/ccs_system_requirements#judge-responses
return [
'compiler-error' => 'CE',
'memory-limit' => 'MLE',
'output-limit' => 'OLE',
'run-error' => 'RTE',
'timelimit' => 'TLE',
'wrong-answer' => 'WA',
'no-output' => 'NO',
'correct' => 'AC',
'final' => [
'compiler-error' => 'CE',
'memory-limit' => 'MLE',
'output-limit' => 'OLE',
'run-error' => 'RTE',
'timelimit' => 'TLE',
'wrong-answer' => 'WA',
'no-output' => 'NO',
'correct' => 'AC',
],
'error' => [
'aborted' => 'JE',
'import-error' => 'IE',
],
'in_progress' => [
'judging' => 'JU',
'pending' => 'JU',
'queued' => 'JU',
],
// The 'external' group is defined in configuration.
];
4 changes: 1 addition & 3 deletions webapp/src/Controller/API/JudgementController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,7 @@ public function __construct(
) {
parent::__construct($entityManager, $DOMJudgeService, $config, $eventLogService);

$verdicts = $this->dj->getVerdicts();
$verdicts['aborted'] = 'JE'; /* happens for aborted judgings */
$this->verdicts = $verdicts;
$this->verdicts = $this->dj->getVerdicts(['final', 'error']);
}

/**
Expand Down
2 changes: 1 addition & 1 deletion webapp/src/Controller/API/JudgementTypeController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ public function singleAction(Request $request, string $id): JudgementType
*/
protected function getJudgementTypes(array $filteredOn = null): array
{
$verdicts = $this->dj->getVerdicts(mergeExternal: true);
$verdicts = $this->dj->getVerdicts(['final', 'external']);

$result = [];
foreach ($verdicts as $name => $label) {
Expand Down
3 changes: 1 addition & 2 deletions webapp/src/Controller/Jury/RejudgingController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,9 +241,8 @@ public function viewAction(
}
$todo = $this->rejudgingService->calculateTodo($rejudging)['todo'];

$verdicts = $this->dj->getVerdicts();
$verdicts = $this->dj->getVerdicts(['final', 'error']);
$verdicts[''] = 'JE'; /* happens for aborted judgings */
$verdicts['aborted'] = 'JE'; /* happens for aborted judgings */

$used = [];
$verdictTable = [];
Expand Down
4 changes: 1 addition & 3 deletions webapp/src/Controller/Jury/ShadowDifferencesController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,7 @@ public function indexAction(
$this->requestStack->getSession()->save();

$contest = $this->dj->getCurrentContest();
$verdicts = array_merge(['judging' => 'JU'], $this->dj->getVerdicts(mergeExternal: true));

$verdicts['import-error'] = 'IE';
$verdicts = $this->dj->getVerdicts(['final', 'error', 'external', 'in_progress']);

$used = [];
$verdictTable = [];
Expand Down
4 changes: 1 addition & 3 deletions webapp/src/Controller/Jury/SubmissionController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,9 +138,7 @@ public function indexAction(
// Load preselected filters
$filters = $this->dj->jsonDecode((string)$this->dj->getCookie('domjudge_submissionsfilter') ?: '[]');

$results = array_keys($this->dj->getVerdicts());
$results[] = 'judging';
$results[] = 'queued';
$results = array_keys($this->dj->getVerdicts(['final', 'in_progress']));

$data = [
'refresh' => $refresh,
Expand Down
5 changes: 1 addition & 4 deletions webapp/src/Form/Type/SubmissionsFilterType.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,10 +115,7 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
"attr" => ["data-filter-field" => "team-id"],
]);

$verdicts = array_keys($this->dj->getVerdicts());
$verdicts[] = "judging";
$verdicts[] = "queued";
$verdicts[] = "import-error";
$verdicts = array_keys($this->dj->getVerdicts(['final', 'error', 'in_progress']));
$builder->add("result", ChoiceType::class, [
"label" => "Filter on result(s)",
"multiple" => true,
Expand Down
15 changes: 10 additions & 5 deletions webapp/src/Service/DOMJudgeService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1485,14 +1485,19 @@
/**
* @return array<string, string>
*/
public function getVerdicts(bool $mergeExternal = false): array
public function getVerdicts(array $groups = ['final']): array
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we create a (string backed?) enum for the groups, we can change it here.

Then we can add

/**
 * @param VerdictGroup[] $groups
 */

{
$verdictsConfig = $this->getDomjudgeEtcDir() . '/verdicts.php';
$verdicts = include $verdictsConfig;
$verdictGroups = include $verdictsConfig;

if ($mergeExternal) {
foreach ($this->config->get('external_judgement_types') as $id => $name) {
$verdicts[$name] = $id;
$verdicts = [];
foreach( $groups as $group ) {

Check failure on line 1494 in webapp/src/Service/DOMJudgeService.php

View workflow job for this annotation

GitHub Actions / phpcs 

Expected 1 space(s) after FOREACH keyword; 0 found

Check failure on line 1494 in webapp/src/Service/DOMJudgeService.php

View workflow job for this annotation

GitHub Actions / phpcs 

Expected 0 spaces after opening bracket; 1 found

Check failure on line 1494 in webapp/src/Service/DOMJudgeService.php

View workflow job for this annotation

GitHub Actions / phpcs 

Expected 0 spaces before closing bracket; 1 found
if ( $group === 'external' ) {

Check failure on line 1495 in webapp/src/Service/DOMJudgeService.php

View workflow job for this annotation

GitHub Actions / phpcs 

Expected 0 spaces after opening bracket; 1 found

Check failure on line 1495 in webapp/src/Service/DOMJudgeService.php

View workflow job for this annotation

GitHub Actions / phpcs 

Expected 0 spaces before closing bracket; 1 found
foreach ($this->config->get('external_judgement_types') as $id => $name) {
$verdicts[$name] = $id;
}
} else {
$verdicts = array_merge($verdicts, $verdictGroups[$group]);
}
}

Expand Down
4 changes: 2 additions & 2 deletions webapp/src/Service/ExternalContestSourceService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ public function getLastReadEventId(): ?string
public function import(bool $fromStart, array $eventsToSkip, ?callable $progressReporter = null): bool
{
// We need the verdicts to validate judgement-types.
$this->verdicts = $this->dj->getVerdicts(mergeExternal: true);
$this->verdicts = $this->dj->getVerdicts(['final', 'external']);

if (!$this->isValidContestSource()) {
throw new LogicException('The contest source is not valid');
Expand Down Expand Up @@ -797,7 +797,7 @@ protected function importJudgementType(Event $event, EventData $data): void
$customVerdicts = $this->config->get('external_judgement_types');
$customVerdicts[$verdict] = str_replace(' ', '-', $data->name);
$this->config->saveChanges(['external_judgement_types' => $customVerdicts], $this->eventLog, $this->dj);
$this->verdicts = $this->dj->getVerdicts(mergeExternal: true);
$this->verdicts = $this->dj->getVerdicts(['final', 'external']);
$penalty = true;
$solved = false;
$this->logger->warning('Judgement type %s not found locally, importing as external verdict', [$verdict]);
Expand Down
Loading