Merge branch 'main' into fs/jquinn

Author: fsargent

.github/FUNDING.yml

@@ -0,0 +1,13 @@
+# These are supported funding model platforms
+
+github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
+custom: ['https://electionscience.org/donate']

README.md

@@ -5,8 +5,7 @@
 These are some methods for running VSE (Voter Satisfaction Efficiency)
 simulations for various voting systems. 
 
-See [Voter Satisfaction Efficiency FAQ](http://electionscience.github.io/vse-sim/VSE/) for an explanation of the methods and results.
-To reproduce the figures in the paper:
+See [Voter Satisfaction Efficiency FAQ](http://electionscience.github.io/vse-sim/) for an explanation of the methods and results.
 
 # Installing the code
 Requirements: python3, scipy, pydoc

dataClasses.py

@@ -56,7 +56,7 @@ def winnerSet(cls, ballots, numWinners=1):
     def honBallot(cls, utils, **kw):
         """Takes utilities and returns an honest ballot
         """
-        raise NotImplementedError("{} needs honBallot".format(cls))
+        raise NotImplementedError(f"{cls} needs honBallot")
 
     @classmethod
     def vaBallot(cls, utils, electabilities, **kw):
@@ -152,7 +152,7 @@ def winner(results):
         >>> 2 < Method().winner([1,2,1,3,3,3,2,1,2]) < 6
         True
         """
-        winScore = max([result for result in results if isnum(result)])
+        winScore = max(result for result in results if isnum(result))
         winners = [cand for (cand, score) in enumerate(results) if score==winScore]
         #return random.choice(winners)
         return winners[0] #made it deterministic to prevent nondeterministic behaviors in useful functions
@@ -198,6 +198,7 @@ def stratTarget2(places):
     @staticmethod
     def stratTarget3(places):
         ((frontId,frontResult), (targId, targResult)) = places[0:3:2]
+
         return (frontId, frontResult, targId, targResult)
 
     stratTargetFor = stratTarget2
@@ -247,8 +248,9 @@ def rememberBallot(fun):
     """
     def getAndRemember(cls, voter, tally=None):
         ballot = fun(cls, voter)
-        setattr(voter, cls.__name__ + "_" + fun.__name__[:-6], ballot) #leave off the "...Ballot"
+        setattr(voter, f"{cls.__name__}_{fun.__name__[:-6]}", ballot)
         return ballot
+
     getAndRemember.__name__ = fun.__name__
     getAndRemember.allTallyKeys = lambda:[]
     return getAndRemember
@@ -263,9 +265,10 @@ def getAndRemember(cls, voter, tally=None):
         ballots = fun(cls, voter)
         for bType, ballot in ballots.items():
 
-            setattr(voter, cls.__name__ + "_" + bType, ballot)
+            setattr(voter, f"{cls.__name__}_{bType}", ballot)
 
         return ballots[fun.__name__[:-6]] #leave off the "...Ballot"
+
     getAndRemember.__name__ = fun.__name__
     getAndRemember.allTallyKeys = lambda:[]
     return getAndRemember