modify at output data format

tracking/dotrack/dotracks.py

@@ -394,21 +394,24 @@ class Track:
 
     
 class doTracks:
-    def __init__(self, bboxes, TracksDict):
-        '''fundamental property'''
+    def __init__(self, bboxes, trackefeats):
+        '''fundamental property
+        trackefeats: dict, key 格式 "fid_bid"
+        '''
         self.bboxes = bboxes
         # self.TracksDict = TracksDict
         self.frameID = np.unique(bboxes[:, 7].astype(int))
         self.trackID = np.unique(bboxes[:, 4].astype(int))
         
         self.lboxes = self.array2list() 
-        self.lfeats = self.getfeats(TracksDict)
+        self.lfeats = self.getfeats(trackefeats)
         
         '''对 self.tracks 中的元素进行分类，将 track 归入相应列表中'''
         self.Hands = []
         self.Kids = []
         self.Static = []
-        self.Residual = []    
+        self.Residual = []
+        self.Confirmed = []
         self.DownWard = []    # subset of self.Residual
         self.UpWard = []      # subset of self.Residual
         self.FreeMove = []    # subset of self.Residual
@@ -435,15 +438,22 @@ class doTracks:
         
         return lboxes
     
-    def getfeats(self, TracksDict):
+    def getfeats(self, trackefeats):
         lboxes = self.lboxes
         lfeats = []
         for boxes in lboxes:
-            afeat = readDict(boxes, TracksDict)       
-            lfeats.append(afeat)
+            feats = []
+            for i in range(boxes.shape[0]):
+                fid, bid = int(boxes[i, 7]), int(boxes[i, 8])   
+                key = f"{int(fid)}_{int(bid)}"
+                if key in trackefeats:
+                    feats.append(trackefeats[key])
+            feats = np.asarray(feats, dtype=np.float32)
+            lfeats.append(feats)
         
         return lfeats
-        
+    
+  
 
     def similarity(self):
         nt = len(self.tracks)

tracking/dotrack/dotracks_back.py

@@ -6,6 +6,7 @@ Created on Mon Mar  4 18:36:31 2024
 """
 import numpy as np
 import cv2
+import copy
 from tracking.utils.mergetrack import track_equal_track
 from scipy.spatial.distance import cdist
 from pathlib import Path
@@ -19,9 +20,9 @@ from .track_back import backTrack
 
 
 class doBackTracks(doTracks):
-    def __init__(self, bboxes, TracksDict):
+    def __init__(self, bboxes, trackefeats):
         
-        super().__init__(bboxes, TracksDict)
+        super().__init__(bboxes, trackefeats)
         
         self.tracks = [backTrack(b, f) for b, f in zip(self.lboxes, self.lfeats)]
         
@@ -113,6 +114,22 @@ class doBackTracks(doTracks):
         #     self.merge_based_hands(htrack)
        
         self.Residual = tracks
+        self.Confirmed = self.confirm_track()
+        
+    def confirm_track(self):
+        Confirmed = None
+        mindist = 0
+        for track in self.Residual:
+            md = min(track.trajrects_wh)
+            if md > mindist:
+                mindist = copy.deepcopy(md)
+                Confirmed = copy.deepcopy(track)
+                
+        if Confirmed is not None:
+            return [Confirmed]
+
+        return []
+        
     
     # def merge_based_hands(self, htrack):
     #     gtracks = htrack.Goods
@@ -122,6 +139,8 @@ class doBackTracks(doTracks):
     #         btrack, bfious = gtracks[1]
     
     
+
+    
     def associate_with_hand(self, htrack, gtrack):
         ''' 
         迁移至基类：

tracking/dotrack/dotracks_front.py

@@ -5,6 +5,7 @@ Created on Mon Mar  4 18:38:20 2024
 @author: ym
 """
 import cv2
+import copy
 import numpy as np
 from pathlib import Path
 
@@ -16,8 +17,8 @@ from .dotracks import doTracks
 from .track_front import frontTrack
 
 class doFrontTracks(doTracks):
-    def __init__(self, bboxes, TracksDict):
-        super().__init__(bboxes, TracksDict)
+    def __init__(self, bboxes, frameDictList):
+        super().__init__(bboxes, frameDictList)
         
         # self.tracks = [frontTrack(b) for b in self.lboxes]
         self.tracks = [frontTrack(b, f) for b, f in zip(self.lboxes, self.lfeats)]
@@ -84,11 +85,24 @@ class doFrontTracks(doTracks):
         tracks = self.sub_tracks(tracks, static_tracks)            
 
         freemoved_tracks = [t for t in tracks if t.is_free_move()]
-        
         tracks = self.sub_tracks(tracks, freemoved_tracks)
-                    
-
+        
         self.Residual = tracks
+        self.Confirmed = self.confirm_track()
+        
+    def confirm_track(self):
+        Confirmed = None
+        mindist = 0
+        for track in self.Residual:
+            md = min(track.trajrects_wh)
+            if md > mindist:
+                mindist = copy.deepcopy(md)
+                Confirmed = copy.deepcopy(track)
+                
+        if Confirmed is not None:
+            return [Confirmed]
+
+        return []
   
     def associate_with_hand(self, htrack, gtrack):
         '''