From 1199845cdf1c342a8d99d8ded3ab162ad3819ac8 Mon Sep 17 00:00:00 2001 From: Matthias Bisping Date: Mon, 16 Jan 2023 08:45:47 +0100 Subject: [PATCH] Refactoring: Rename --- cv_analysis/utils/merging.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/cv_analysis/utils/merging.py b/cv_analysis/utils/merging.py index 527f26d..4dae50f 100644 --- a/cv_analysis/utils/merging.py +++ b/cv_analysis/utils/merging.py @@ -19,7 +19,6 @@ def merge_related_rectangles(rectangles: List[Rectangle]) -> List[Rectangle]: def merge_rectangles_once(rectangles: List[Rectangle]) -> List[Rectangle]: """Merges rectangles that are related to each other, but does not iterate on the results.""" - rectangles = set(rectangles) merged, used = reduce(merge_if_related, combinations(rectangles, 2), (set(), set())) @@ -30,10 +29,10 @@ T = Tuple[Set[Rectangle], Set[Rectangle]] V = Tuple[Rectangle, Rectangle] -def merge_if_related(acc: T, pair: V) -> T: +def merge_if_related(merged_and_used_so_far: T, rectangle_pair: V) -> T: """Merges two rectangles if they are related, otherwise returns the accumulator unchanged.""" - alpha, beta = pair - merged, used = acc + alpha, beta = rectangle_pair + merged, used = merged_and_used_so_far def unused(*args) -> bool: return not used & {*args}