diff --git a/image_prediction/stitcher/stitcher.py b/image_prediction/stitcher/stitcher.py index a0d91d2..605790e 100644 --- a/image_prediction/stitcher/stitcher.py +++ b/image_prediction/stitcher/stitcher.py @@ -5,7 +5,7 @@ from funcy import compose, second from image_prediction.image_extractor.extractor import ImageMetadataPair from image_prediction.stitcher.utils import make_coord_getter, make_group_merger -from image_prediction.utils.generic import until_convergence +from image_prediction.utils.generic import until class Stitcher: @@ -53,4 +53,4 @@ class Stitcher: def break_condition(pairs1, pairs2): return len(pairs1) == len(pairs2) - return until_convergence(self.merge_along_both_axes, break_condition, pairs) + return until(self.merge_along_both_axes, break_condition, pairs) diff --git a/image_prediction/stitcher/utils.py b/image_prediction/stitcher/utils.py index 951a621..81a6405 100644 --- a/image_prediction/stitcher/utils.py +++ b/image_prediction/stitcher/utils.py @@ -7,7 +7,7 @@ from funcy import juxt, first, rest from image_prediction.image_extractor.extractor import ImageMetadataPair from image_prediction.info import Info -from image_prediction.utils.generic import until_convergence +from image_prediction.utils.generic import until from test.utils.stitching import HorizontalKeyMapper, VerticalKeyMapper @@ -130,12 +130,11 @@ def make_merger_aggregator(direction): def merge_group(group, direction): - def break_condition(pairs1, pairs2): return len(pairs1) == len(pairs2) reduce_group = make_merger_aggregator(direction) - return until_convergence(reduce_group, break_condition, group) + return until(reduce_group, break_condition, group) def merge_group_horizontally(group): diff --git a/image_prediction/utils/generic.py b/image_prediction/utils/generic.py index 1560a9e..c02e016 100644 --- a/image_prediction/utils/generic.py +++ b/image_prediction/utils/generic.py @@ -8,7 +8,7 @@ def chunk_iterable(iterable, chunk_size): return takewhile(truth, map(tuple, starmap(islice, repeat((iter(iterable), chunk_size))))) -def until_convergence(func, cond, *args, **kwargs): +def until(func, cond, *args, **kwargs): for a, b in chunk_iterable(iterate(func, *args, **kwargs), chunk_size=2): if cond(a, b): return a