Commit 7ae056d

committed

Add memory/output/code limits to problem endpoint

1 parent 9c5f04a commit 7ae056dCopy full SHA for 7ae056d

File tree

+23

-2

lines changed

+23

-2

lines changed

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -165,6 +165,9 @@ public function getStatusAction(Request $request): Access`
`165`	`165`	`'rgb',`
`166`	`166`	`'color',`
`167`	`167`	`'time_limit',`
	`168`	`+ 'memory_limit',`
	`169`	`+ 'output_limit',`
	`170`	`+ 'code_limit',`
`168`	`171`	`'test_data_count',`
`169`	`172`	`'statement',`
`170`	`173`	`// DOMjudge specific properties:`

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -476,7 +476,13 @@ public function transformObject($object): ContestProblem\|ContestProblemWrapper`
`476`	`476`	`$problem = $object[0];`
`477`	`477`	`$testDataCount = (int)$object['testdatacount'];`
`478`	`478`	`if ($this->dj->checkrole('jury')) {`
`479`		`- return new ContestProblemWrapper($problem, $testDataCount);`
	`479`	`+ return new ContestProblemWrapper(`
	`480`	`+ $problem,`
	`481`	`+ (int)round(($problem->getProblem()->getMemlimit() === null ? $this->config->get('memory_limit') : $problem->getProblem()->getMemlimit()) / 1024),`
	`482`	`+ (int)round(($problem->getProblem()->getOutputlimit() === null ? $this->config->get('output_limit') : $problem->getProblem()->getOutputlimit()) / 1024),`
	`483`	`+ $this->config->get('sourcesize_limit'),`
	`484`	`+ $testDataCount,`
	`485`	`+ );`
`480`	`486`	`} else {`
`481`	`487`	`return $problem;`
`482`	`488`	`}`

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace App\DataTransferObject;`
`4`	`4`
	`5`	`+use App\Controller\API\AbstractRestController as ARC;`
`5`	`6`	`use App\Entity\ContestProblem;`
`6`	`7`	`use JMS\Serializer\Annotation as Serializer;`
`7`	`8`
`@@ -10,6 +11,12 @@ class ContestProblemWrapper`
`10`	`11`	`public function __construct(`
`11`	`12`	`#[Serializer\Inline]`
`12`	`13`	`protected readonly ContestProblem $contestProblem,`
	`14`	`+ #[Serializer\Groups([ARC::GROUP_NONSTRICT, '2025-draft'])]`
	`15`	`+ protected readonly int $memoryLimit,`
	`16`	`+ #[Serializer\Groups([ARC::GROUP_NONSTRICT, '2025-draft'])]`
	`17`	`+ protected readonly int $outputLimit,`
	`18`	`+ #[Serializer\Groups([ARC::GROUP_NONSTRICT, '2025-draft'])]`
	`19`	`+ protected readonly int $codeLimit,`
`13`	`20`	`#[Serializer\SerializedName('test_data_count')]`
`14`	`21`	`protected readonly int $testDataCount`
`15`	`22`	`) {}`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public function testAccessAsAdmin(): void`
`32`	`32`	`'contest' => ['id', 'name', 'formal_name', 'start_time', 'duration', 'scoreboard_freeze_duration', 'penalty_time'],`
`33`	`33`	`'judgement-types' => ['id', 'name', 'penalty', 'solved'],`
`34`	`34`	`'languages' => ['id', 'name', 'entry_point_required', 'entry_point_name', 'extensions'],`
`35`		`- 'problems' => ['id', 'label', 'name', 'ordinal', 'rgb', 'color', 'time_limit', 'test_data_count', 'statement'],`
	`35`	`+ 'problems' => ['id', 'label', 'name', 'ordinal', 'rgb', 'color', 'time_limit', 'memory_limit', 'output_limit', 'code_limit', 'test_data_count', 'statement'],`
`36`	`36`	`'groups' => ['id', 'icpc_id', 'name', 'hidden'],`
`37`	`37`	`'organizations' => ['id', 'icpc_id', 'name', 'formal_name', 'country', 'country_flag'],`
`38`	`38`	`'teams' => ['id', 'icpc_id', 'name', 'display_name', 'organization_id', 'group_ids'],`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,11 @@ protected function setUp(): void`
`18`	`18`	`$this->expectedObjects['boolfind']['test_data_count'] = 10;`
`19`	`19`	`$this->expectedObjects['fltcmp']['test_data_count'] = 1+3; // 1 sample, 3 secret cases`
`20`	`20`	`$this->expectedObjects['hello']['test_data_count'] = 1;`
	`21`	`+ foreach (array_keys($this->expectedObjects) as $problemId) {`
	`22`	`+ $this->expectedObjects[$problemId]['memory_limit'] = 2048;`
	`23`	`+ $this->expectedObjects[$problemId]['output_limit'] = 8;`
	`24`	`+ $this->expectedObjects[$problemId]['code_limit'] = 256;`
	`25`	`+ }`
`21`	`26`	`parent::setUp();`
`22`	`27`	`}`
`23`	`28`

Comments

(0)