From eee2f0e256c13709a72571cc4edf14dc82491d55 Mon Sep 17 00:00:00 2001 From: Matthias Bisping Date: Wed, 4 Jan 2023 17:40:42 +0100 Subject: [PATCH] Refactoring Rename module --- cv_analysis/figure_detection/figure_detection.py | 2 +- cv_analysis/layout_parsing.py | 2 +- cv_analysis/server/pipeline.py | 2 +- cv_analysis/table_parsing.py | 2 +- cv_analysis/utils/postprocessing.py | 2 +- cv_analysis/utils/{structures.py => rectangle.py} | 0 cv_analysis/utils/spacial.py | 2 +- cv_analysis/utils/test_metrics.py | 2 +- test/fixtures/server.py | 2 +- test/unit_tests/server_pipeline_test.py | 2 +- test/unit_tests/table_parsing_test.py | 2 +- 11 files changed, 10 insertions(+), 10 deletions(-) rename cv_analysis/utils/{structures.py => rectangle.py} (100%) diff --git a/cv_analysis/figure_detection/figure_detection.py b/cv_analysis/figure_detection/figure_detection.py index 72b6fc6..3d15c38 100644 --- a/cv_analysis/figure_detection/figure_detection.py +++ b/cv_analysis/figure_detection/figure_detection.py @@ -11,7 +11,7 @@ from cv_analysis.utils.filters import ( is_not_too_large, ) from cv_analysis.utils.postprocessing import remove_included -from cv_analysis.utils.structures import Rectangle +from cv_analysis.utils.rectangle import Rectangle def detect_figures(image: np.array): diff --git a/cv_analysis/layout_parsing.py b/cv_analysis/layout_parsing.py index f5de783..ef00aef 100644 --- a/cv_analysis/layout_parsing.py +++ b/cv_analysis/layout_parsing.py @@ -8,7 +8,7 @@ import numpy as np from cv_analysis.utils.connect_rects import connect_related_rects2 -from cv_analysis.utils.structures import Rectangle +from cv_analysis.utils.rectangle import Rectangle from cv_analysis.utils.postprocessing import ( remove_overlapping, remove_included, diff --git a/cv_analysis/server/pipeline.py b/cv_analysis/server/pipeline.py index 3de4d4f..34b14e9 100644 --- a/cv_analysis/server/pipeline.py +++ b/cv_analysis/server/pipeline.py @@ -5,7 +5,7 @@ from funcy import lmap, flatten from cv_analysis.figure_detection.figure_detection import detect_figures from cv_analysis.table_parsing import parse_tables -from cv_analysis.utils.structures import Rectangle +from cv_analysis.utils.rectangle import Rectangle from pdf2img.conversion import convert_pages_to_images from pdf2img.default_objects.image import ImagePlus, ImageInfo from pdf2img.default_objects.rectangle import RectanglePlus diff --git a/cv_analysis/table_parsing.py b/cv_analysis/table_parsing.py index 37c50e6..5205585 100644 --- a/cv_analysis/table_parsing.py +++ b/cv_analysis/table_parsing.py @@ -8,7 +8,7 @@ from funcy import lmap, lfilter from cv_analysis.layout_parsing import parse_layout from cv_analysis.utils.postprocessing import remove_isolated # xywh_to_vecs, xywh_to_vec_rect, adjacent1d -from cv_analysis.utils.structures import Rectangle +from cv_analysis.utils.rectangle import Rectangle from cv_analysis.utils.visual_logging import vizlogger diff --git a/cv_analysis/utils/postprocessing.py b/cv_analysis/utils/postprocessing.py index 2f40c48..1ce776f 100644 --- a/cv_analysis/utils/postprocessing.py +++ b/cv_analysis/utils/postprocessing.py @@ -2,7 +2,7 @@ from functools import partial from itertools import starmap, compress from typing import Iterable, List -from cv_analysis.utils.structures import Rectangle +from cv_analysis.utils.rectangle import Rectangle def remove_overlapping(rectangles: Iterable[Rectangle]) -> List[Rectangle]: diff --git a/cv_analysis/utils/structures.py b/cv_analysis/utils/rectangle.py similarity index 100% rename from cv_analysis/utils/structures.py rename to cv_analysis/utils/rectangle.py diff --git a/cv_analysis/utils/spacial.py b/cv_analysis/utils/spacial.py index 8a03881..b5a955c 100644 --- a/cv_analysis/utils/spacial.py +++ b/cv_analysis/utils/spacial.py @@ -10,7 +10,7 @@ from funcy import juxt, rpartial, compose, lflatten from cv_analysis.utils import lift if TYPE_CHECKING: - from cv_analysis.utils.structures import Rectangle + from cv_analysis.utils.rectangle import Rectangle def adjacent(alpha: Rectangle, beta: Rectangle, tolerance=7): diff --git a/cv_analysis/utils/test_metrics.py b/cv_analysis/utils/test_metrics.py index 91d3676..f9aab22 100644 --- a/cv_analysis/utils/test_metrics.py +++ b/cv_analysis/utils/test_metrics.py @@ -5,7 +5,7 @@ import numpy as np from funcy import lmap, lpluck from cv_analysis.utils import lift -from cv_analysis.utils.structures import Rectangle +from cv_analysis.utils.rectangle import Rectangle def find_max_overlap(box: Rectangle, box_list: Iterable[Rectangle]): diff --git a/test/fixtures/server.py b/test/fixtures/server.py index 99825e4..342aa4e 100644 --- a/test/fixtures/server.py +++ b/test/fixtures/server.py @@ -6,7 +6,7 @@ import cv2 import pytest from funcy import first -from cv_analysis.utils.structures import Rectangle +from cv_analysis.utils.rectangle import Rectangle @pytest.fixture diff --git a/test/unit_tests/server_pipeline_test.py b/test/unit_tests/server_pipeline_test.py index 0abb98f..2257225 100644 --- a/test/unit_tests/server_pipeline_test.py +++ b/test/unit_tests/server_pipeline_test.py @@ -3,7 +3,7 @@ import numpy as np import pytest from cv_analysis.server.pipeline import table_parsing_formatter, figure_detection_formatter, make_analysis_pipeline -from cv_analysis.utils.structures import Rectangle +from cv_analysis.utils.rectangle import Rectangle def analysis_fn_mock(image: np.ndarray): diff --git a/test/unit_tests/table_parsing_test.py b/test/unit_tests/table_parsing_test.py index db610e3..33cd46a 100644 --- a/test/unit_tests/table_parsing_test.py +++ b/test/unit_tests/table_parsing_test.py @@ -6,7 +6,7 @@ from funcy import lmap, compose from cv_analysis.table_parsing import parse_tables from cv_analysis.utils import lift -from cv_analysis.utils.structures import Rectangle +from cv_analysis.utils.rectangle import Rectangle from cv_analysis.utils.test_metrics import compute_document_score