Mercurial > ~astiob > upreckon > hgweb
diff testcases.py @ 76:0e5ae28e0b2b
Points are now weighted on a test context basis
In particular, this has allowed for simple extensions to the format
of testconf to award points to whole test groups without at the same time
compromising the future ability of giving partial score for correct
but slow solutions. Specifically, the groupweight configuration variable
has been added and normally has the format {groupindex: points} where
groupindex is the group's index in the tests configuration variable.
The backwards incompatible change is that test contexts are no longer
guaranteed to learn the score awarded or the maximum possible score
for every test case and may instead be notified about them in batches.
In other news, the pointmap and groupweight configuration variables can
(now) be given as sequences in addition to mappings. (Technically,
the distinction currently made is dict versus everything else.) Items
of a sequence pointmap/groupweight correspond directly to the test cases/
groups defined in the tests configuration variable; in particular,
when groups are used, tests=[1],[2,3];pointmap={1:1,2:2,3:3} can now be
written as pointmap=tests=[1],[2,3]. Missing items are handled in the same
way in which they are handled when the variable is a mapping. Note
that the items of groupweight correspond to whole test groups rather
than individual test cases.
In other news again, the wording of problem total lines has been changed
from '<unweighted> points; weighted score: <weighted>' to '<weighted>
points (<unweighted> before weighting)', and group total lines now
properly report fractional numbers of points (this is a bug fix).
| author | Oleg Oshmyan <chortos@inbox.lv> |
|---|---|
| date | Sat, 08 Jan 2011 16:03:35 +0200 |
| parents | 7520b6bb6636 |
| children | 69eadc60f4e2 |
line wrap: on
line diff
--- a/testcases.py Thu Jan 06 23:53:31 2011 +0200 +++ b/testcases.py Sat Jan 08 16:03:35 2011 +0200 @@ -680,8 +680,7 @@ __slots__ = () def end(self): say('Sample total: %d/%d tests' % (self.ncorrect, self.ntotal)) - return self.log - + return 0, 0, self.log def load_problem(prob, _types={'batch' : BatchTestCase, 'outonly' : OutputOnlyTestCase, @@ -717,12 +716,37 @@ prob.config.tests = newtests del newtests + # Even if they have duplicate test identifiers, we must honour sequence pointmaps + if isinstance(prob.config.pointmap, dict): + def getpoints(i, j, k=None): + try: + return prob.config.pointmap[i] + except KeyError: + try: + return prob.config.pointmap[None] + except KeyError: + return prob.config.maxexitcode or 1 + elif prob.config.usegroups: + def getpoints(i, j, k): + try: + return prob.config.pointmap[k][j] + except LookupError: + return prob.config.maxexitcode or 1 + else: + def getpoints(i, j): + try: + return prob.config.pointmap[j] + except LookupError: + return prob.config.maxexitcode or 1 + # First get prob.cache.padoutput right, # then yield the actual test cases for i in prob.config.dummies: s = 'sample ' + str(i).zfill(prob.config.paddummies) prob.cache.padoutput = max(prob.cache.padoutput, len(s)) if prob.config.usegroups: + if not isinstance(prob.config.groupweight, dict): + prob.config.groupweight = dict(enumerate(prob.config.groupweight)) for group in prob.config.tests: for i in group: s = str(i).zfill(prob.config.padtests) @@ -732,11 +756,13 @@ s = str(i).zfill(prob.config.paddummies) yield _types[prob.config.kind](prob, s, True, 0) yield problem.test_context_end - for group in prob.config.tests: - yield problem.TestGroup() - for i in group: + for k, group in enumerate(prob.config.tests): + if not group: + continue + yield problem.TestGroup(prob.config.groupweight.get(k, prob.config.groupweight.get(None))) + for j, i in enumerate(group): s = str(i).zfill(prob.config.padtests) - yield _types[prob.config.kind](prob, s, False, prob.config.pointmap.get(i, prob.config.pointmap.get(None, prob.config.maxexitcode if prob.config.maxexitcode else 1))) + yield _types[prob.config.kind](prob, s, False, getpoints(i, j, k)) yield problem.test_context_end else: for i in prob.config.tests: @@ -745,6 +771,6 @@ for i in prob.config.dummies: s = str(i).zfill(prob.config.paddummies) yield _types[prob.config.kind](prob, s, True, 0) - for i in prob.config.tests: + for j, i in enumerate(prob.config.tests): s = str(i).zfill(prob.config.padtests) - yield _types[prob.config.kind](prob, s, False, prob.config.pointmap.get(i, prob.config.pointmap.get(None, prob.config.maxexitcode if prob.config.maxexitcode else 1))) \ No newline at end of file + yield _types[prob.config.kind](prob, s, False, getpoints(i, j)) \ No newline at end of file