@@ -34,7 +34,7 @@ from electionparams import * r_tables_xml = [base.file_in_dir(data_path, filenames.MEETING_THREE_OUT, 'Meeting Three Out') for data_path in DATA_PATHS] r_tables_list = [data.parse_r_tables(r_tables) for r_tables in r_tables_xml] -print "ok now tallying\n\n" +# print "ok now tallying\n\n" # the list of partitions, each of which is a list of the max number of answers each question allows partition_map = election.partition_map_choices @@ -79,7 +79,7 @@ Tally %s -""" % (election.spec.id, len(r_tables[0].rows), RESULT)) +""" % (election.spec.id, len(BALLOTS), RESULT)) if __name__ == '__main__': tally(sys.stdout) \ No newline at end of file tally.py @@ -70,7 +70,7 @@ class RankBallot(object): bad_ballot = b print "oy" - print candidate_tallies + # print candidate_tallies if max(candidate_tallies) >= absolute_majority: break @@ -79,7 +79,7 @@ class RankBallot(object): lowest_count = min([tally for tally in candidate_tallies if tally is not None]) lowest_count_index = candidate_tallies.index(lowest_count) eliminated.append(lowest_count_index) - print "eliminating candidate %s with count %s" % (lowest_count_index, lowest_count) + #print "eliminating candidate %s with count %s" % (lowest_count_index, lowest_count) for b in ballots: b.go_next_choice(lowest_count_index) tallydata.py 20c68ba41ebf9d718dec86c2c8c4b4324e7bfd6f Ben Adida ben@BigDaddy.local http://github.com/benadida/scantegrity-audit/commit/36413f71ce16d9fa00907b8e9ecaea53ec0d9bf1 36413f71ce16d9fa00907b8e9ecaea53ec0d9bf1 2009-11-04T16:03:41-08:00 2009-11-04T16:03:41-08:00 fixed tallying for single-question 116fb8bf26f234cb591cb6def235e00904736898 Ben Adida ben@BigDaddy.local