diff --git a/soccertrack/metrics/__init__.py b/soccertrack/metrics/__init__.py index 6804f922..f2876981 100644 --- a/soccertrack/metrics/__init__.py +++ b/soccertrack/metrics/__init__.py @@ -1,3 +1,8 @@ +from soccertrack.metrics.cost_matrix_metrics import ( + BaseCostMatrixMetric, + CosineCMM, + IoUCMM, +) from soccertrack.metrics.hota import hota_score from soccertrack.metrics.identity import identity_score from soccertrack.metrics.mota import mota_score @@ -8,11 +13,6 @@ map_score, map_score_range, ) -from soccertrack.metrics.cost_matrix_metrics import ( - BaseCostMatrixMetric, - IoUCMM, - CosineCMM, -) __all__ = [ "hota_score", diff --git a/soccertrack/metrics/cost_matrix_metrics.py b/soccertrack/metrics/cost_matrix_metrics.py index c5a34d49..7924c71a 100644 --- a/soccertrack/metrics/cost_matrix_metrics.py +++ b/soccertrack/metrics/cost_matrix_metrics.py @@ -6,13 +6,9 @@ import numpy as np from scipy.spatial.distance import cdist +from soccertrack.checks import _check_cost_matrix, _check_detections, _check_trackers from soccertrack.metrics import iou_score from soccertrack.types import Detection, Tracker -from soccertrack.checks import ( - _check_trackers, - _check_detections, - _check_cost_matrix, -) class BaseCostMatrixMetric(ABC): diff --git a/soccertrack/metrics/tracking_preprocess.py b/soccertrack/metrics/tracking_preprocess.py index 44be6ff8..0dcf0b2a 100644 --- a/soccertrack/metrics/tracking_preprocess.py +++ b/soccertrack/metrics/tracking_preprocess.py @@ -5,6 +5,7 @@ import numpy as np from scipy.spatial.distance import cdist + from soccertrack.metrics.object_detection import convert_to_x1y1x2y2, iou_score diff --git a/soccertrack/tracking_model/matching.py b/soccertrack/tracking_model/matching.py index b3d822eb..ab0f05a3 100644 --- a/soccertrack/tracking_model/matching.py +++ b/soccertrack/tracking_model/matching.py @@ -10,10 +10,13 @@ from scipy.optimize import linear_sum_assignment from scipy.spatial.distance import cdist -from soccertrack.checks import (_check_cost_matrix, _check_detections, - _check_matches, _check_trackers) -from soccertrack.metrics import (BaseCostMatrixMetric, CosineCMM, IoUCMM, - iou_score) +from soccertrack.checks import ( + _check_cost_matrix, + _check_detections, + _check_matches, + _check_trackers, +) +from soccertrack.metrics import BaseCostMatrixMetric, CosineCMM, IoUCMM, iou_score from soccertrack.tracking_model import SingleObjectTracker from soccertrack.types import Detection diff --git a/soccertrack/tracking_model/multi_object_tracker.py b/soccertrack/tracking_model/multi_object_tracker.py index 887bfbdf..8a91f5fb 100644 --- a/soccertrack/tracking_model/multi_object_tracker.py +++ b/soccertrack/tracking_model/multi_object_tracker.py @@ -12,8 +12,7 @@ from soccertrack import BBoxDataFrame, Camera from soccertrack.logger import logger, tqdm -from soccertrack.tracking_model.tracker import (KalmanTracker, - SingleObjectTracker) +from soccertrack.tracking_model.tracker import KalmanTracker, SingleObjectTracker from soccertrack.types import Box, Detection, Track, Vector, _pathlike DEFAULT_MODEL_SPEC = ModelPreset.constant_velocity_and_static_box_size_2d.value diff --git a/soccertrack/tracking_model/single_object_tracker.py b/soccertrack/tracking_model/single_object_tracker.py index ad86d697..7a405529 100644 --- a/soccertrack/tracking_model/single_object_tracker.py +++ b/soccertrack/tracking_model/single_object_tracker.py @@ -1,16 +1,16 @@ from __future__ import annotations import uuid +from abc import ABC, abstractmethod from collections.abc import Iterable from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Type, Union -from abc import ABC, abstractmethod import numpy as np import pandas as pd from soccertrack import BBoxDataFrame from soccertrack.logger import logger -from soccertrack.types import Detection, Box, Vector, Tracker +from soccertrack.types import Box, Detection, Tracker, Vector class SingleObjectTracker(Tracker): diff --git a/tests/test_tracking_model/test_matching.py b/tests/test_tracking_model/test_matching.py index 3b79fe44..a91e278a 100644 --- a/tests/test_tracking_model/test_matching.py +++ b/tests/test_tracking_model/test_matching.py @@ -16,8 +16,7 @@ import numpy as np from soccertrack.logger import * -from soccertrack.tracking_model import (MotionVisualMatchingFunction, - SingleObjectTracker) +from soccertrack.tracking_model import MotionVisualMatchingFunction, SingleObjectTracker from soccertrack.types import Detection dets = [