arthur.zhu/ScoDoc
1
0
Fork 0
forked from ScoDoc/ScoDoc
Code Issues Pull Requests Projects Releases Wiki Activity

Removed support for user defined BONUS functions with TWO arguments

Browse Source
This commit is contained in:
Emmanuel Viennet 2021-07-21 15:57:16 +03:00
parent d30c071c5d
commit 35c900b3d7
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/scodoc/notes_table.py
View File

@ -72,10 +72,6 @@ from app.scodoc import sco_preferences
from app.scodoc import sco_etud from app.scodoc import sco_etud
# Support for old user-written "bonus" functions with 2 args:
BONUS_TWO_ARGS = len(inspect.getargspec(scu.CONFIG.compute_bonus)[0]) == 2
def comp_ranks(T): def comp_ranks(T):
"""Calcul rangs à partir d'une liste ordonnée de tuples [ (valeur, ..., etudid) ] """Calcul rangs à partir d'une liste ordonnée de tuples [ (valeur, ..., etudid) ]
(valeur est une note numérique), en tenant compte des ex-aequos (valeur est une note numérique), en tenant compte des ex-aequos
@ -934,15 +930,9 @@ class NotesTable(object):
if len(coefs_bonus_gen) == 1: if len(coefs_bonus_gen) == 1:
coefs_bonus_gen = [1.0] # irrelevant, may be zero coefs_bonus_gen = [1.0] # irrelevant, may be zero
if BONUS_TWO_ARGS: bonus = scu.CONFIG.compute_bonus(
# backward compat: compute_bonus took only 2 args notes_bonus_gen, coefs_bonus_gen, infos=infos
bonus = scu.CONFIG.compute_bonus( )
notes_bonus_gen, coefs_bonus_gen
)
else:
bonus = scu.CONFIG.compute_bonus(
notes_bonus_gen, coefs_bonus_gen, infos=infos
)
self.bonus[etudid] = bonus self.bonus[etudid] = bonus
infos["moy"] += bonus infos["moy"] += bonus
infos["moy"] = min(infos["moy"], 20.0) # clip bogus bonus infos["moy"] = min(infos["moy"], 20.0) # clip bogus bonus