Skip to content
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

Change default checker to oicompare #31

Merged
merged 3 commits into from
Sep 23, 2024
Merged

Change default checker to oicompare #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0ca544f
Change default checker to oicompare
MasloMaslane Sep 9, 2024
4e5b41d
Ability to change oicompare's language
MasloMaslane Sep 9, 2024
59c312a
Allow changing oicompare format
MasloMaslane Sep 15, 2024
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
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

setup(
name = "sioworkers",
version = '1.5.2',
version = '1.5.3',
author = "SIO2 Project Team",
author_email = '[email protected]',
description = "Programming contest judging infrastructure",
Expand Down
26 changes: 20 additions & 6 deletions sio/executors/checker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,12 +87,12 @@ def execute_checker(with_stderr=False, stderr=None):
return renv['stdout']


def _run_compare(env):
e = SandboxExecutor('exec-sandbox')
def _run_compare(env, format):
e = SandboxExecutor('oicompare-sandbox-v1.0.2')
renv = _run_in_executor(
env, [os.path.join('bin', 'compare'), 'hint', 'out'], e, ignore_errors=True
env, [os.path.join('bin', 'oicompare'), 'hint', 'out', format], e, ignore_errors=True
)
return renv['stdout']
return renv


def _limit_length(s):
Expand All @@ -116,7 +116,21 @@ def run(environ, use_sandboxes=True):

output = _run_checker(environ, use_sandboxes)
elif use_sandboxes:
output = _run_compare(environ)
renv = _run_compare(environ, environ.get('checker_format', 'english_abbreviated'))
if renv['return_code'] == 0:
environ['result_code'] = 'OK'
environ['result_percentage'] = (100, 1)
elif renv['return_code'] == 1:
environ['result_code'] = 'WA'
environ['result_percentage'] = (0, 1)
# Should be redundant because we are using oicompare with abbreviated output,
# but just in case.
environ['result_string'] = _limit_length(renv['stdout'][0])
else:
raise CheckerError(
'oicompare returned code(%d). Checker renv: %s' % (renv['return_code'], renv)
)
return environ
else:
output = _run_diff(environ)
except (CheckerError, ExecError) as e:
Expand Down Expand Up @@ -155,4 +169,4 @@ def output_to_fraction(output_str):
except ZeroDivisionError:
raise CheckerError('Zero division in checker output "%s"' % output_str)
except TypeError:
raise CheckerError('Invalid checker output "%s"' % output_str)
raise CheckerError('Invalid checker output "%s"' % output_str)
Loading