Update display to order the rankings by rcount

Author: epacuit

.DS_Store

@@ -22,7 +22,7 @@
 author = 'Wes Holliday and Eric Pacuit'
 
 # The full version, including alpha/beta/rc tags
-release = '1.16.21'
+release = '1.16.24'
 html_extra_path = ['../../axiom_tables']
 
 

docs/.DS_Store

@@ -1 +1 @@
-__version__ = '1.16.21'
+__version__ = '1.16.24'

docs/source/conf.py

@@ -707,7 +707,12 @@ def description(self):
         rs, cs = self.rankings_counts
         return f"Profile({[list([int(c) for c in r]) for r in rs]}, rcounts={[int(c) for c in cs]}, cmap={self.cmap})"
 
-    def display(self, cmap=None, style="pretty", curr_cands=None):
+    def display(
+            self, 
+            cmap=None, 
+            style="pretty", 
+            curr_cands=None,
+            order_by_counts=False):
         """Display a profile (restricted to ``curr_cands``) as an ascii table (using tabulate).
 
         :param cmap: the candidate map to use (overrides the cmap associated with this profile)
@@ -732,7 +737,13 @@ def display(self, cmap=None, style="pretty", curr_cands=None):
 
         rankings = self._rankings if curr_cands is None else _find_updated_profile(self._rankings, np.array([c for c in self.candidates if c not in curr_cands]), len(self.candidates))
 
-        print(tabulate([[cmap[c] for c in cs] for cs in rankings.transpose()], self._rcounts, tablefmt=style))        
+        if order_by_counts: 
+            rankings, rcounts = zip(*sorted(zip(rankings, self._rcounts), key=lambda x: x[1], reverse=True))
+            rankings = np.array(rankings)
+        else: 
+            rcounts = self._rcounts
+
+        print(tabulate([[cmap[c] for c in cs] for cs in rankings.transpose()], rcounts, tablefmt=style))        
 
     def to_preflib_instance(self):
         """

example.ipynb

@@ -808,7 +808,13 @@ def description(self):
         """
         return f"ProfileWithTies({[r.rmap for r in self._rankings]}, rcounts={[int(c) for c in self.rcounts]}, cmap={self.cmap})"
 
-    def display(self, cmap=None, style="pretty", curr_cands=None):
+    def display(
+            self, 
+            cmap=None, 
+            style="pretty", 
+            curr_cands=None,
+            order_by_counts=False,
+            ):
         """Display a profile (restricted to ``curr_cands``) as an ascii table (using tabulate).
 
         :param cmap: the candidate map (overrides the cmap associated with this profile)
@@ -834,7 +840,10 @@ def display(self, cmap=None, style="pretty", curr_cands=None):
         _rankings = [r.normalize_ranks() or r for r in _rankings]
         curr_cands = curr_cands if curr_cands is not None else self.candidates
         cmap = cmap if cmap is not None else self.cmap
-
+        if order_by_counts: 
+            _rankings, rcounts = zip(*sorted(zip(_rankings, self.rcounts), key=lambda x: x[1], reverse=True))
+        else:
+            rcounts = self.rcounts
         print(
             tabulate(
                 [
@@ -850,7 +859,7 @@ def display(self, cmap=None, style="pretty", curr_cands=None):
                     ]
                     for rank in self.ranks
                 ],
-                self.rcounts,
+                rcounts,
                 tablefmt=style,
             )
         )

pref_voting/__init__.py

@@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"
 
 [tool.poetry]
 name = "pref_voting"
-version = "1.16.21"
+version = "1.16.24"
 description = "pref_voting is a Python package that contains tools to reason about elections and margin graphs, and implementations of voting methods."
 authors = ["Eric Pacuit <[email protected]>"]
 license = "MIT"