From 43cb0fffed2a27b75a59cfadc052d0fb5a792cbf Mon Sep 17 00:00:00 2001 From: Matthias Bisping Date: Fri, 8 Apr 2022 14:13:03 +0200 Subject: [PATCH] refactoring --- image_prediction/stitching/merging.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/image_prediction/stitching/merging.py b/image_prediction/stitching/merging.py index 60fbb74..d7b8c7e 100644 --- a/image_prediction/stitching/merging.py +++ b/image_prediction/stitching/merging.py @@ -60,7 +60,7 @@ def merge_group(group: Iterable[ImageMetadataPair], direction): return until(no_new_merges, reduce_group, group) -def make_merger_aggregator(direction) -> Callable[[Iterable[ImageMetadataPair]], Iterable[ImageMetadataPair]]: +def make_merger_aggregator(axis) -> Callable[[Iterable[ImageMetadataPair]], Iterable[ImageMetadataPair]]: """Produces a function f : [H, T1, ... Tn] -> [HTi...Tj, Tk ... Tl] that merges adjacent image-metadata pairs on the head H and aggregates non-adjacent in the tail T. """ @@ -81,9 +81,9 @@ def make_merger_aggregator(direction) -> Callable[[Iterable[ImageMetadataPair]], aggregation_pair, pairs = juxt(first, rest)(pairs) return list(reduce(merge_on_head_and_aggregate_in_tail, pairs, [aggregation_pair])) - c1_getter = make_coord_getter(f"{direction}1") - c2_getter = make_coord_getter(f"{direction}2") - pair_merger = make_pair_merger(direction) + c1_getter = make_coord_getter(f"{axis}1") + c2_getter = make_coord_getter(f"{axis}2") + pair_merger = make_pair_merger(axis) return merger_aggregator