Skip to content

Fix grade formula location #32

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
Debilski merged 2 commits into from
Apr 12, 2025
Merged

Fix grade formula location #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
32479b9
grader: fix 'grade location'
keszybz Apr 12, 2025
62fd7ad
grader: fix 'grade formula'
keszybz Apr 12, 2025
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
4 changes: 4 additions & 0 deletions grader/applications.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,6 +449,10 @@ def formula(self, formula):
def location(self):
return self['formula.location']

@location.setter
def location(self, location):
self['formula.location'] = location


# This class is a collection of applications for an edition of the school
# It can be iterated over and it can return a subset of applications matching
Expand Down
31 changes: 17 additions & 14 deletions grader/grader.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,18 +498,21 @@ def do_grade(self, arg):

if opts.what == 'formula':
if opts.person:
self.formula = ' '.join(opts.person)
minsc, maxsc, contr = find_min_max(self.formula, self.location,
self.programming_rating,
self.open_source_rating,
self.python_rating,
self.vcs_rating,
self.underrep_rating,
self._applied_range(),
self.all_nationalities,
self.all_affiliations)

printf('formula = {}', self.formula)
self.applications.ini.formula = ' '.join(opts.person)
minsc, maxsc, contr = find_min_max(
formula=self.applications.ini.formula,
location=self.applications.ini.location,
programming_rating=self.applications.ini.get_ratings('programming'),
open_source_rating=self.applications.ini.get_ratings('open_source'),
python_rating=self.applications.ini.get_ratings('python'),
vcs_rating=self.applications.ini.get_ratings('vcs'),
underrep_rating=self.applications.ini.get_ratings('underrep'),
applied=self._applied_range(),
all_nationalities=self.applications.all_nationalities(),
all_affiliations=self.applications.all_affiliations(),
)

printf('formula = {}', self.applications.ini.formula)
printf('score ∈ [{:6.3f},{:6.3f}]', minsc, maxsc)
printf('applied ∈ {}', self._applied_range())
print('contributions:')
Expand All @@ -521,8 +524,8 @@ def do_grade(self, arg):
return
elif opts.what == 'location':
if opts.person:
self.location = ' '.join(opts.person)
printf('location = {}', self.location)
self.applications.ini.location = ' '.join(opts.person)
printf('location = {}', self.applications.ini.location)
return

if opts.label:
Expand Down