Marmelator/cv-analysis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 37 Wiki Activity

Adjust type hints for new lower python version

Browse Source
This commit is contained in:
Matthias Bisping 2023-01-02 15:46:35 +01:00
parent d52b2bfe22
commit 7bbe459208
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cv_analysis/utils/postprocessing.py
View File

@ -1,11 +1,11 @@
from collections import namedtuple
from functools import partial
from itertools import starmap, compress
from typing import Iterable
from typing import Iterable, List
from cv_analysis.utils.structures import Rectangle
def remove_overlapping(rectangles: Iterable[Rectangle]) -> list[Rectangle]:
def remove_overlapping(rectangles: Iterable[Rectangle]) -> List[Rectangle]:
def overlap(a: Rectangle, rect2: Rectangle) -> float:
return a.intersection(rect2) > 0
@ -16,12 +16,12 @@ def remove_overlapping(rectangles: Iterable[Rectangle]) -> list[Rectangle]:
return rectangles
def remove_included(rectangles: Iterable[Rectangle]) -> list[Rectangle]:
def remove_included(rectangles: Iterable[Rectangle]) -> List[Rectangle]:
keep = [rect for rect in rectangles if not rect.is_included(rectangles)]
return keep
def __remove_isolated_unsorted(rectangles: Iterable[Rectangle]) -> list[Rectangle]:
def __remove_isolated_unsorted(rectangles: Iterable[Rectangle]) -> List[Rectangle]:
def is_connected(rect: Rectangle, rectangles: Iterable[Rectangle]):
return any(rect.adjacent(rect2) for rect2 in rectangles if not rect == rect2)
@ -29,7 +29,7 @@ def __remove_isolated_unsorted(rectangles: Iterable[Rectangle]) -> list[Rectangl
return rectangles
def __remove_isolated_sorted(rectangles: Iterable[Rectangle]) -> list[Rectangle]:
def __remove_isolated_sorted(rectangles: Iterable[Rectangle]) -> List[Rectangle]:
def is_connected(left, center, right):
return any([left.adjacent(center), center.adjacent(right)])
@ -42,7 +42,7 @@ def __remove_isolated_sorted(rectangles: Iterable[Rectangle]) -> list[Rectangle]
return rectangles
def remove_isolated(rectangles: Iterable[Rectangle], input_unsorted=True) -> list[Rectangle]:
def remove_isolated(rectangles: Iterable[Rectangle], input_unsorted=True) -> List[Rectangle]:
return (__remove_isolated_unsorted if input_unsorted else __remove_isolated_sorted)(rectangles)