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

Fix

Browse Source 
Fix a typehint
Fix a bug that would happen when a generator is passed
This commit is contained in:
Matthias Bisping 2023-01-04 12:06:23 +01:00
parent 47e657aaa3
commit 77f565c652
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cv_analysis/utils/postprocessing.py
View File

@ -9,7 +9,7 @@ def remove_overlapping(rectangles: Iterable[Rectangle]) -> List[Rectangle]:
def overlap(a: Rectangle, rect2: Rectangle) -> float:
return a.intersection(rect2) > 0
def does_not_overlap(rect: Rectangle, rectangles: Iterable[Rectangle]) -> list:
def does_not_overlap(rect: Rectangle, rectangles: Iterable[Rectangle]) -> bool:
return not any(overlap(rect, rect2) for rect2 in rectangles if not rect == rect2)
rectangles = list(filter(partial(does_not_overlap, rectangles=rectangles), rectangles))
@ -25,7 +25,10 @@ def __remove_isolated_unsorted(rectangles: Iterable[Rectangle]) -> List[Rectangl
def is_connected(rect: Rectangle, rectangles: Iterable[Rectangle]):
return any(rect.adjacent(rect2) for rect2 in rectangles if not rect == rect2)
rectangles = list(filter(partial(is_connected, rectangles=list(rectangles)), rectangles))
if not isinstance(rectangles, list):
rectangles = list(rectangles)
rectangles = list(filter(partial(is_connected, rectangles=rectangles), rectangles))
return rectangles