Marmelator/image-classification-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 29 Wiki Activity

refactoring

Browse Source
This commit is contained in:
Matthias Bisping 2022-04-07 21:12:57 +02:00
parent bb5db1b4ef
commit 7e6fe7cf11
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
test/unit_tests/image_stitcher_test.py
View File

@ -168,6 +168,7 @@ def merge_group_vertically(group):
class Stitcher: class Stitcher:
@staticmethod @staticmethod
def groupby(pairs, coord_getter): def groupby(pairs, coord_getter):
pairs = sorted(pairs, key=coord_getter) pairs = sorted(pairs, key=coord_getter)
@ -179,14 +180,27 @@ class Stitcher:
def merge_along_axis(self, pairs, axis): def merge_along_axis(self, pairs, axis):
def group_pairs_by_c1(pairs):
return self.groupby(pairs, c1_getter)
def group_by_c2(pairs):
return self.groupby(pairs, c2_getter)
def group_pairs_within_groups_by_c2(groups):
return map(group_by_c2, groups)
def merge_groups_along_orthogonal_axis(groups):
return map(group_merger, groups)
c1_getter = make_coord_getter(f"{self.other_axis(axis)}1") c1_getter = make_coord_getter(f"{self.other_axis(axis)}1")
c2_getter = make_coord_getter(f"{self.other_axis(axis)}2") c2_getter = make_coord_getter(f"{self.other_axis(axis)}2")
group_merger = make_group_merger(axis) group_merger = make_group_merger(axis)
groups = self.groupby(pairs, c1_getter) groups_of_pairs_with_same_c1 = group_pairs_by_c1(pairs)
groups = chain.from_iterable(map(rpartial(self.groupby, c2_getter), groups)) groups_of_groups_of_pairs_with_same_c1_and_c2 = group_pairs_within_groups_by_c2(groups_of_pairs_with_same_c1)
groups = map(group_merger, groups) groups_of_pairs_with_matching_c1_and_c2 = chain(*groups_of_groups_of_pairs_with_same_c1_and_c2)
pairs = chain.from_iterable(groups) groups_of_merged_pairs = merge_groups_along_orthogonal_axis(groups_of_pairs_with_matching_c1_and_c2)
pairs = chain(*groups_of_merged_pairs)
return pairs return pairs