|
13 | 13 | import pytest |
14 | 14 |
|
15 | 15 | from OTAnalytics.application.datastore import DetectionMetadata, TrackParseResult |
| 16 | +from OTAnalytics.domain import track |
16 | 17 | from OTAnalytics.domain.video import VideoMetadata |
17 | 18 | from OTAnalytics.plugin_datastore.polars_track_store import PolarsTrackDataset |
18 | 19 | from OTAnalytics.plugin_datastore.track_geometry_store.polars_geometry_store import ( |
19 | 20 | PolarsTrackGeometryDataset, |
20 | 21 | ) |
| 22 | +from OTAnalytics.plugin_parser import ottrk_dataformat as ottrk |
21 | 23 | from OTAnalytics.plugin_parser.feathers_parser import FeathersParser |
22 | 24 |
|
23 | 25 |
|
@@ -279,58 +281,58 @@ def test_parse_files_with_different_column_order( |
279 | 281 | """ |
280 | 282 |
|
281 | 283 | columns_order_a = [ |
282 | | - "classification", |
283 | | - "confidence", |
284 | | - "x", |
285 | | - "y", |
286 | | - "w", |
287 | | - "h", |
288 | | - "interpolated_detection", |
289 | | - "first", |
290 | | - "finished", |
291 | | - "frame", # swapped |
292 | | - "video_name", |
293 | | - "input_file", |
294 | | - "original_track_id", |
295 | | - "track_classification", |
296 | | - "track_id", |
297 | | - "occurrence", |
| 284 | + track.CLASSIFICATION, |
| 285 | + track.CONFIDENCE, |
| 286 | + track.X, |
| 287 | + track.Y, |
| 288 | + track.W, |
| 289 | + track.H, |
| 290 | + track.INTERPOLATED_DETECTION, |
| 291 | + ottrk.FIRST, |
| 292 | + ottrk.FINISHED, |
| 293 | + track.FRAME, # swapped |
| 294 | + track.VIDEO_NAME, |
| 295 | + track.INPUT_FILE, |
| 296 | + track.ORIGINAL_TRACK_ID, |
| 297 | + track.TRACK_CLASSIFICATION, |
| 298 | + track.TRACK_ID, |
| 299 | + track.OCCURRENCE, |
298 | 300 | ] |
299 | 301 | columns_order_b = [ |
300 | | - "classification", |
301 | | - "confidence", |
302 | | - "x", |
303 | | - "y", |
304 | | - "w", |
305 | | - "h", |
306 | | - "frame", # swapped |
307 | | - "interpolated_detection", |
308 | | - "first", |
309 | | - "finished", |
310 | | - "video_name", |
311 | | - "input_file", |
312 | | - "track_classification", |
313 | | - "original_track_id", |
314 | | - "track_id", |
315 | | - "occurrence", |
| 302 | + track.CLASSIFICATION, |
| 303 | + track.CONFIDENCE, |
| 304 | + track.X, |
| 305 | + track.Y, |
| 306 | + track.W, |
| 307 | + track.H, |
| 308 | + track.FRAME, # swapped |
| 309 | + track.INTERPOLATED_DETECTION, |
| 310 | + ottrk.FIRST, |
| 311 | + ottrk.FINISHED, |
| 312 | + track.VIDEO_NAME, |
| 313 | + track.INPUT_FILE, |
| 314 | + track.TRACK_CLASSIFICATION, |
| 315 | + track.ORIGINAL_TRACK_ID, |
| 316 | + track.TRACK_ID, |
| 317 | + track.OCCURRENCE, |
316 | 318 | ] |
317 | 319 | row = { |
318 | | - "classification": "car", |
319 | | - "confidence": 0.9, |
320 | | - "x": 100.0, |
321 | | - "y": 100.0, |
322 | | - "w": 50.0, |
323 | | - "h": 80.0, |
324 | | - "frame": 1, |
325 | | - "interpolated_detection": False, |
326 | | - "first": True, |
327 | | - "finished": False, |
328 | | - "video_name": "test.mp4", |
329 | | - "input_file": "test.ottrk", |
330 | | - "original_track_id": "1", |
331 | | - "track_classification": "car", |
332 | | - "track_id": "1", |
333 | | - "occurrence": datetime(2023, 1, 1, 10, 0, 0), |
| 320 | + track.CLASSIFICATION: "car", |
| 321 | + track.CONFIDENCE: 0.9, |
| 322 | + track.X: 100.0, |
| 323 | + track.Y: 100.0, |
| 324 | + track.W: 50.0, |
| 325 | + track.H: 80.0, |
| 326 | + track.FRAME: 1, |
| 327 | + track.INTERPOLATED_DETECTION: False, |
| 328 | + ottrk.FIRST: True, |
| 329 | + ottrk.FINISHED: False, |
| 330 | + track.VIDEO_NAME: "test.mp4", |
| 331 | + track.INPUT_FILE: "test.ottrk", |
| 332 | + track.ORIGINAL_TRACK_ID: "1", |
| 333 | + track.TRACK_CLASSIFICATION: "car", |
| 334 | + track.TRACK_ID: "1", |
| 335 | + track.OCCURRENCE: datetime(2023, 1, 1, 10, 0, 0), |
334 | 336 | } |
335 | 337 | df_a = polars.DataFrame(row).select(columns_order_a) |
336 | 338 | df_b = polars.DataFrame(row).select(columns_order_b) |
|
0 commit comments