WebSVN – Remote Hare Voting – Diff – /branches/multiverse/tally.py

 ##
 ## To download the complete source distribution, use Subversion:
 ##
 ##      % svn co http://www.bikmort.com/hare
 ##
-## $Id: tally.py 63 2007-09-25 03:00:26Z jtkorb $
+## $Id: tally.py 64 2007-10-15 15:48:23Z jtkorb $
 import sys
 import math
 import copy
 import random
                 else:
                     trace(1, "Not enough chosen candidates to fill all positions")
                     break
 	winners = str(u.winners)
+	if fParallel:
-	trace(1, "RESULTS FOR UNIVERSE %d (p = %f): %s" % (u.id, u.p, winners))
+	    trace(1, "RESULTS FOR UNIVERSE %d (p = %f): %s" % (u.id, u.p, winners))
 	if winners not in Universe.results: Universe.results[winners] = 0.0
 	Universe.results[winners] += u.p
     if fParallel:
-	trace(0, "\nUsed %d parallel universes (skipped %d low probability)" %
+	trace(0, "\nTracked %d alternative decisions (skipped %d with low probability)" %
 	    (Universe.id, Universe.dropped))
     trace(0, "\nFINAL RESULTS")
     lWinners = []
     for winner in Universe.results.keys():
+	if fParallel:
-	lWinners.append("%f: %s" % (Universe.results[winner], winner))
+	    lWinners.append("%f: %s" % (Universe.results[winner], winner))
+	else:
+	    lWinners.append("%s" % winner)
     lWinners.sort()
     lWinners.reverse()
     for winner in lWinners:
 	trace(0, winner)

Subversion Repositories Remote Hare Voting