Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify sorting in get_name_format.

Browse Source 
First, the simplification uses the
built-in cmp_to_key function from functools
to remove the duplicated function in the
class.

Second, the cmp function was reduced to
two cases:
1. When x and y is positive:
Here the st
2. When x or y is negative:
Here the sign of y determines the ordering,
which can be seen from the following cases:

1. x is negative, y is negative =>
their order needs to be, so y is considered
higher, which means x is considered lower
(negative).

2. x is negative, y is positive =>
x is considered higher (positive).

3. x is positive, y is negative =>
y is considered higher, which means x is
considered lower (negative).

Third, the sorting is abstracted away
behind a function declaring the sort order.
This commit is contained in:
Baizley 2019-12-15 21:49:22 +01:00 committed by Nick Hall
parent 02983370bd
commit b66b9b3727
1 changed files with 12 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
gramps/gen/display/name.py
View File

@ -59,6 +59,8 @@ Specific symbols for parts of a name are defined:
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import re import re
import logging import logging
from functools import cmp_to_key
LOG = logging.getLogger(".gramps.gen") LOG = logging.getLogger(".gramps.gen")
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
@ -495,7 +497,7 @@ class NameDisplay:
""" """
the_list = [] the_list = []
keys = sorted(self.name_formats, key=self.cmp_to_key(self._sort_name_format)) keys = self.sort_by_ascending_positives_followed_by_negatives_in_reverse_order(self.name_formats)
for num in keys: for num in keys:
if ((also_default or num) and if ((also_default or num) and
@ -505,40 +507,17 @@ class NameDisplay:
return the_list return the_list
def cmp_to_key(self, mycmp): def sort_by_ascending_positives_followed_by_negatives_in_reverse_order(self, iterable):
""" """
python 2 to 3 conversion, python recipe http://code.activestate.com/recipes/576653/ Sorts the iterable with positive keys first,
Convert a :func:`cmp` function into a :func:`key` function and negative keys last.
We use this in Gramps as understanding the old compare function is The positives will be in ascending order and
not trivial. This should be replaced by a proper key function the negatives in the reverse of their original order
in the iterable.
E.g. [-3, -1, -2, 1, 0, 2, 3] => [0, 1, 2, 3, -2, -1, -3]
""" """
class K: key_function = cmp_to_key(lambda x, y: x - y if x >= 0 and y >= 0 else y)
def __init__(self, obj, *args): return sorted(iterable, key=key_function)
self.obj = obj
def __lt__(self, other):
return mycmp(self.obj, other.obj) < 0
def __gt__(self, other):
return mycmp(self.obj, other.obj) > 0
def __eq__(self, other):
return mycmp(self.obj, other.obj) == 0
def __le__(self, other):
return mycmp(self.obj, other.obj) <= 0
def __ge__(self, other):
return mycmp(self.obj, other.obj) >= 0
def __ne__(self, other):
return mycmp(self.obj, other.obj) != 0
return K
def _sort_name_format(self, x, y):
if x < 0:
if y < 0:
return x+y
else:
return -x+y
else:
if y < 0:
return -x+y
else:
return x-y
def _is_format_valid(self, num): def _is_format_valid(self, num):
try: try: