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)