hjp
/
meeat
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of git.hjp.at:hjp/meeat

This commit is contained in:
Peter J. Holzer 2023-05-14 13:17:01 +02:00 committed by Peter J. Holzer
parent aa9e609446 187718f360
commit b88b0724c7
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app.py
View File

@ -412,7 +412,8 @@ def get_ballots(meet_id, kind):
csr = get_cursor()
q = f"""
select {kind}.*, bod, position, email
select {kind}.*, bod, position, email,
min(w) over(partition by bod order by position) as vote_w
from {kind}
join {kind}_vote on {kind}.id = {kind}_vote.{kind}
join bod on bod = bod.id
@ -447,11 +448,12 @@ def runoff(ballots, direction):
count[r.id] = [0] * len(ballot)
candidates[r.id] = r
for ballot in ballots:
weight = max(r.vote_w for r in ballot)
for pos, r in enumerate(ballot):
log.debug("count = %s", count)
log.debug("r.id = %s", r.id)
log.debug("pos = %s", pos)
count[r.id][pos] += 1
count[r.id][pos] += weight
log.debug("count[%d][%d]) = %d", r.id, pos, count[r.id][pos])
if direction == "backward":
result = sorted(count.keys(), key=lambda i: list(reversed(count[i])), reverse=True)

6
utils/instantrunoff
View File

@ -21,7 +21,8 @@ def get_ballots():
kind = args.kind
q = f"""
select {kind}.*, bod, position
select {kind}.*, bod, position,
min(w) over(partition by bod order by position) as vote_w
from {kind} join {kind}_vote on {kind}.id = {kind}_vote.{kind}
where meet = %s
order by bod, position
@ -52,8 +53,9 @@ def runoff(ballots):
count[r.id] = [0] * len(ballot)
candidates[r.id] = r
for ballot in ballots:
weight = max(r.vote_w for r in ballot)
for pos, r in enumerate(ballot):
count[r.id][pos] += 1
count[r.id][pos] += weight
if args.reverse:
result = sorted(count.keys(), key=lambda i: list(reversed(count[i])), reverse=True)
else: