WebSVN – Remote Hare Voting – Diff – /trunk/tally.py

 import sys
 import math
 import random
+fdOut = None
 fTrace = 1
 randcalls = 0
 def trace(s):
-    global fTrace
+    global fTrace, fdOut
-    if fTrace: print s
+    if fTrace: print >>fdOut, s
     return
 def findWinner(winners, losers, tally, quota, nWinners):
     global randcalls
     cWin = quota       # number of votes for highest winner
 def dotally(nWinners, ballots):
     global randcalls
     nBallots = len(ballots)
     quota = int(math.ceil((nBallots + 1.0)/(nWinners + 1)))
-    trace("INPUT SUMMARY")
+    trace("INPUT SUMMARY AND SINGLE RUN TRACE")
     trace("\t%d ballots" % nBallots)
     trace("\tChoosing %s winners" % nWinners)
     trace("\tNeed ceil((%d + 1)/(%d + 1)) = %d ballots to win" %
           (nBallots, nWinners, quota))
-    # Create initial tally
+    # Create initial tally and statistics
+    #
     tally = {}
     for ballot in ballots:
         candidate = ballot[0]
         if not tally.has_key(candidate):
             tally[candidate] = []
         tally[candidate].append(ballot)
+    total1st = {}
+    total2nd = {}
+    totalMrk = {}
+    for ballot in ballots:
+        for c in ballot:
+            total1st[c] = 0
+            total2nd[c] = 0
+            totalMrk[c] = 0
+    for ballot in ballots:
+        total1st[ballot[0]] += 1
+        if len(ballot) > 1:
+            total2nd[ballot[1]] += 1
+        for c in ballot:
+            totalMrk[c] += 1
+    trace("\n\tBALLOT MARKS\t1ST\t2ND\tNONE")
+    candidates = totalMrk.keys()
+    candidates.sort()
+    for c in candidates:
+        trace("\t%-16s%3d\t%3d\t%4d" % (c, total1st[c], total2nd[c], len(ballots)-totalMrk[c]))
     traceTally(quota, tally)
     winners = []
     losers = []

Subversion Repositories Remote Hare Voting

(root)/trunk/tally.py – Rev 44 → 45