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

Jump to bottom

Result percentage changed to a fraction #332

Merged
merged 4 commits into from
Apr 24, 2024
Merged

Result percentage changed to a fraction #332

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b1943f7
Result percentage changed to a fraction
SZonkil Jan 24, 2024
c3e71ca
Changed how max_score is calculated
SZonkil Mar 19, 2024
c71bc20
Bump sioworkers version
MasloMaslane Mar 20, 2024
c425ba3
Fix bug in calculating the percentage
MasloMaslane Apr 18, 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
8 changes: 4 additions & 4 deletions oioioi/programs/tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -961,19 +961,19 @@ class TestScorers(TestCase):
t_results_ok_perc = (
(
{'exec_time_limit': 100, 'max_score': 100},
{'result_code': 'OK', 'time_used': 0, 'result_percentage': 99},
{'result_code': 'OK', 'time_used': 0, 'result_percentage': (99, 1)},
),
(
{'exec_time_limit': 100, 'max_score': 100},
{'result_code': 'OK', 'time_used': 75, 'result_percentage': 50},
{'result_code': 'OK', 'time_used': 75, 'result_percentage': (50, 1)},
),
(
{'exec_time_limit': 100, 'max_score': 100},
{'result_code': 'OK', 'time_used': 75, 'result_percentage': 0},
{'result_code': 'OK', 'time_used': 75, 'result_percentage': (0, 1)},
),
(
{'exec_time_limit': 100, 'max_score': 100},
{'result_code': 'OK', 'time_used': 99, 'result_percentage': 1},
{'result_code': 'OK', 'time_used': 99, 'result_percentage': (1, 1)},
),
)

Expand Down
9 changes: 5 additions & 4 deletions oioioi/programs/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import os.path
from fractions import Fraction
from math import ceil
from operator import itemgetter # pylint: disable=E0611

Expand Down Expand Up @@ -98,8 +99,8 @@ def min_group_scorer(test_results):

def discrete_test_scorer(test, result):
status = result['result_code']
percentage = result.get('result_percentage', 100)
max_score = int(ceil(percentage * test['max_score'] / 100.))
percentage = result.get('result_percentage', (100, 1))
max_score = ceil(Fraction(*percentage) / 100. * test['max_score'])
score = max_score if status == 'OK' else 0
return IntegerScore(score), IntegerScore(test['max_score']), status

Expand All @@ -109,8 +110,8 @@ def threshold_linear_test_scorer(test, result):
limit = test.get('exec_time_limit', 0)
used = result.get('time_used', 0)
status = result['result_code']
percentage = result.get('result_percentage', 100)
max_score = int(ceil(percentage * test['max_score'] / 100.0))
percentage = result.get('result_percentage', (100, 1))
max_score = ceil(Fraction(*percentage) / 100. * test['max_score'])
test_max_score = IntegerScore(test['max_score'])

if status != 'OK':
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# These dependencies need to be installed from external sources,
# therefore they must be listed here. Moreover, they cannot be listed in
# setup.py, as pip is not able to install them.
http:https://github.com/sio2project/sioworkers/archive/refs/tags/v1.4.3.tar.gz
http:https://github.com/sio2project/sioworkers/archive/refs/tags/v1.4.4.tar.gz

-e .
Loading