Add approval+runoff and blanket primary variants (issue #17)

elsim/methods/__init__.py

@@ -4,21 +4,24 @@
 These take collections of ballots (elections) as inputs and return the winner
 according to the rules of that method.
 """
-from elsim.methods.approval import approval, combined_approval
-from elsim.methods.black import black
-from elsim.methods.borda import borda
-from elsim.methods.condorcet import (condorcet, condorcet_from_matrix,
-                                     ranked_election_to_matrix)
-from elsim.methods.coombs import coombs
-from elsim.methods.fptp import fptp, sntv
-from elsim.methods.irv import irv
-from elsim.methods.runoff import runoff
-from elsim.methods.score import score
-from elsim.methods.star import matrix_from_scores, star
-from elsim.methods.utility_winner import utility_winner
+from .approval import approval, combined_approval
+from .black import black
+from .blanket_primary import (approval_runoff, irv_primary_top_n_runoff,
+                              top_n_condorcet, top_n_irv, top_n_runoff)
+from .borda import borda
+from .condorcet import (condorcet, condorcet_from_matrix,
+                        ranked_election_to_matrix)
+from .coombs import coombs
+from .fptp import fptp, sntv
+from .irv import irv
+from .runoff import runoff
+from .score import score
+from .star import matrix_from_scores, star
+from .utility_winner import utility_winner
 
 __all__ = [
     'approval',
+    'approval_runoff',
     'black',
     'borda',
     'combined_approval',
@@ -27,11 +30,15 @@
     'coombs',
     'fptp',
     'irv',
+    'irv_primary_top_n_runoff',
     'matrix_from_scores',
     'ranked_election_to_matrix',
     'runoff',
     'sntv',
     'score',
     'star',
+    'top_n_condorcet',
+    'top_n_irv',
+    'top_n_runoff',
     'utility_winner',
 ]