From dff029de20b835d10f849992a262938ab4c6ced0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=BA=86=E5=88=9A?= <wangqingggang@yimaogo.com>
Date: Sat, 25 May 2024 18:35:53 +0800
Subject: [PATCH] modify byte.trackerupdate, add list first_finded

---
 __pycache__/export.cpython-39.pyc             | Bin 0 -> 31110 bytes
 track_reid.py                                 |  80 ++++++++++++------
 tracking/__pycache__/__init__.cpython-39.pyc  | Bin 0 -> 129 bytes
 .../__pycache__/dotracks.cpython-39.pyc       | Bin 11418 -> 11686 bytes
 .../__pycache__/dotracks_back.cpython-39.pyc  | Bin 3529 -> 4261 bytes
 .../__pycache__/dotracks_front.cpython-39.pyc | Bin 4154 -> 4157 bytes
 .../__pycache__/track_back.cpython-39.pyc     | Bin 8832 -> 9261 bytes
 .../__pycache__/track_front.cpython-39.pyc    | Bin 5453 -> 4289 bytes
 tracking/dotrack/dotracks.py                  |  10 ++-
 tracking/dotrack/dotracks_back.py             |  46 ++++------
 tracking/dotrack/track_back.py                |  40 +++++++--
 tracking/dotrack/track_front.py               |   4 +-
 tracking/test_tracking.py                     |   8 +-
 .../__pycache__/byte_tracker.cpython-39.pyc   | Bin 14047 -> 14082 bytes
 tracking/trackers/byte_tracker.py             |   7 +-
 .../__pycache__/drawtracks.cpython-39.pyc     | Bin 8676 -> 8920 bytes
 tracking/utils/drawtracks.py                  |  17 ++--
 17 files changed, 132 insertions(+), 80 deletions(-)
 create mode 100644 __pycache__/export.cpython-39.pyc
 create mode 100644 tracking/__pycache__/__init__.cpython-39.pyc

diff --git a/__pycache__/export.cpython-39.pyc b/__pycache__/export.cpython-39.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..999dfae2405e5cce0dd1163b4ec0cdea70321037
GIT binary patch
literal 31110
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
B(JKG|

literal 0
HcmV?d00001

diff --git a/track_reid.py b/track_reid.py
index c0cb47c..f55a638 100644
--- a/track_reid.py
+++ b/track_reid.py
@@ -206,7 +206,12 @@ def run(
     handpose = hand_pose()
     handlocals_dict = {}
     
-    boxes_and_imgs = []
+    boxes_and_imgs  = []
+    
+    BoxesFeats = []
+    
+    
+    
     track_boxes = np.empty((0, 9), dtype = np.float32)
     det_boxes = np.empty((0, 9), dtype = np.float32)
     
@@ -263,28 +268,41 @@ def run(
                 det = det.cpu().numpy()
                 det = np.concatenate([det[:, :4], np.arange(nd).reshape(-1, 1), det[:, 4:]], axis=-1) 
                 
-                '''FeatFlag为相对于上一帧boxes，当前boxes是否为静止的标志。'''
-                # def static_estimate(box1, box2, TH1=8, TH2=12):
-                #     dij_abs = max(np.abs(box1 - box2))
-                #     dij_euc = max([np.linalg.norm((box1[:2] - box2[:2])), 
-                #                    np.linalg.norm((box1[2:4] - box2[2:4]))
-                #                    ])
-                #     if dij_abs < TH1 and dij_euc < TH2:
-                #         return True
-                #     else:
-                #         return False
-                # FeatFlag = [-1] * nd  
-                # if len(boxes_and_imgs):
-                #     detj = boxes_and_imgs[-1][0]
-                #     frmj = boxes_and_imgs[-1][-1]  
-                #     for ii in range(nd):
-                #         ## flag 中保存的是box索引
-                #         condt1 = frame-frmj==1
-                #         flag = [idx for jj, idx in enumerate(detj[:, 4]) if condt1 and static_estimate(det[ii, :4], detj[jj, :4])]
-                #         if len(flag) == 1:
-                #             FeatFlag[ii] = flag[0]
-                # boxes_and_imgs.append((det, im0, frame)) 
+                #
+                def static_estimate(box1, box2, TH1=8, TH2=12):
+                    dij_abs = max(np.abs(box1 - box2))
+                    dij_euc = max([np.linalg.norm((box1[:2] - box2[:2])), 
+                                    np.linalg.norm((box1[2:4] - box2[2:4]))
+                                    ])
+                    if dij_abs < TH1 and dij_euc < TH2:
+                        return True
+                    else:
+                        return False
 
+                nw = 3                      # 向前递推检查的窗口大小
+                nf = len(BoxesFeats)        # 已经检测+特征提取的帧数
+                feat_curr = [None] * nd     # nd: 当前帧检测出的boxes数
+                for ii in range(nd):
+                    box = det[ii, :4]
+                    
+                    kk=1
+                    feat = None
+                    while kk <= nw and nf>=kk:
+                        ki = -1 * kk
+                        boxes_ = BoxesFeats[ki][0]
+                        feats_ = BoxesFeats[ki][1]
+
+                        flag = [jj for jj in range(len(boxes_)) if static_estimate(box, boxes_[jj, :4])]
+                        if len(flag) == 1:
+                            feat = feats_[flag[0]]
+                            break 
+                        kk += 1
+                    if feat is not None:
+                        feat_curr[ii] = feat
+                        
+                        
+
+                
                 ## ================================================================ writed by WQG
                 
                 '''tracks: [x1, y1, x2, y2, track_id, score, cls, frame_index, box_index]
@@ -301,6 +319,9 @@ def run(
                 '''================== 1. 存储 dets/subimgs/features Dict ============='''
                 imgs, features = inference_image(im0, tracks)
                 
+                BoxesFeats.append((tracks, features))
+                
+                
                 imgdict = {}
                 boxdict = {}
                 featdict = {}
@@ -504,17 +525,20 @@ def main_loop(opt):
     if os.path.isdir(p):
         files = find_files_in_nested_dirs(p)
         
-        # files = [#r"D:\datasets\ym\videos\标记视频\test_20240402-173935_6920152400975_back_174037372.mp4",
-                  # r"D:\datasets\ym\videos\标记视频\test_20240402-173935_6920152400975_front_174037379.mp4"]
+        # files = [r"D:\datasets\ym\广告板遮挡测试\8\6926636301004_20240508-175300_back_addGood_70f754088050_215_17327712807.mp4",
+        #           r"D:\datasets\ym\videos\标记视频\test_20240402-173935_6920152400975_back_174037372.mp4",
+        #           r"D:\datasets\ym\videos\标记视频\test_20240402-173935_6920152400975_front_174037379.mp4",
+        #           r"D:\datasets\ym\广告板遮挡测试\8\2500441577966_20240508-175946_front_addGood_70f75407b7ae_155_17788571404.mp4"
+        #           ]
         
-        # files = [r"D:\datasets\ym\广告板遮挡测试\8\2500441577966_20240508-175946_front_addGood_70f75407b7ae_155_17788571404.mp4"]
+        files = [r"D:\datasets\ym\videos\标记视频\test_20240402-173935_6920152400975_back_174037372.mp4"]
         for file in files:
             optdict["source"] = file
             run(**optdict)
             
-            k += 1
-            if k == 3:
-                break
+            # k += 1
+            # if k == 3:
+            #     break
     elif os.path.isfile(p):
         optdict["source"] = p
         run(**vars(opt))
diff --git a/tracking/__pycache__/__init__.cpython-39.pyc b/tracking/__pycache__/__init__.cpython-39.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..d1bcf8a2dc3f4f85a851b2ee8e419f127340a2bd
GIT binary patch
literal 129
zcmYe~<>g`kg8OIIq=M+jAOaaM0yz#qT+9L_QW%06G#UL?G8BP?5yUSw7poYT)RNTX
sl8~ar<m}A6^q3MDBR)PeFS8^*Uaz3?7Kcr4eoARhsvSuGXCP((0M6_jyZ`_I

literal 0
HcmV?d00001

diff --git a/tracking/dotrack/__pycache__/dotracks.cpython-39.pyc b/tracking/dotrack/__pycache__/dotracks.cpython-39.pyc
index 3c19ebf812f434e4cdc24d108c3668760fb1c38e..e48e9385a0ffb29e1dd4ff9fd545fe6d23a59f56 100644
GIT binary patch
delta 2808
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
WF~x~cihxTOMmps%8>p)#?f(JWnhz@g

delta 2487
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
GNbDa%082{%

diff --git a/tracking/dotrack/__pycache__/dotracks_back.cpython-39.pyc b/tracking/dotrack/__pycache__/dotracks_back.cpython-39.pyc
index cd47a5708023b8968c835ad79f834386c680315e..fe155c64d33261fa31f6f8b42ca2a03d94bc484a 100644
GIT binary patch
delta 1256
zcmZ`&-Afcv6rXeN%<SxEp(3TZe)ZuRLLq7vVb(^0^o2$+D7MY)+NiB|XBSjv^Fbk>
z0=d;gFDleS4?RSGLG;v<J;ppo5P`k+R_Dy@mProW-=2HU@0{Pc=idF;{Hi^bOD1Cq
ze%sG)72Y(wO*KGz47Yj31Y0rLW2FE#*lg7>xy@~LRgqcvTGyLBJD$y#@>Xd~<g6K|
zI3)+!uVn)>Ra_jG`w3x9nN})c0mXx?vH}%`KG<X)+XBG&CiehshAfUUH5LzqRTB1i
zkf+)j#Y?KkJ#~eVZ%vuhsueg@aBO{72@Fl^D5UKY(gLB#E|y*`pi>0xhzDCxiP%QK
zi3HN%k(6OaN0m&hd=$?mH+Uzs$$7QsFcYc=>+GS5K@fn!*Whz&)|F{B4d>)}_3rXN
zoNrO&h(iQT1T_8-l4PY2hRHa9U{Sr=$I#Gl)#Gv-5vCMRnMeg~<J`8YT?Dl<;74a1
zd(tiCO8MnL=rst++#_|7T>q7#OB}`J9z+PFj0#R7JnG-BGfc#h;KRaSpZIf<OBfO=
z)yH8qSsk@fO;l=Hv6UH>=C=u3NUIgcPU#h8n6DK?vHZY{I&N?h$J%#fS4gO)BX{_z
zj(w>&c2UpRqK%|Lw3Bzg3%OHExt@uNI^3Ar)m+hbeLcTW$`@@v=9ceGmgv9W`h3Zm
zH`Nixc1?X0=kHkZr<xuz!tn>$@%xxv<(o0Os4zFQgG+PGB>g&8H6+`$=E2~tq^TL2
zuy0tiIoEXxi~YEB+Yl74vlJv)f~TMk8d-vNJfXfD*WLpYM`UZ{q~3)*k&!neOHG|<
zn(^s5r&yKA91Pn$Cci{_;j}zt*f8;~V$=h4$@OUeQ8Q-EiQ+tFlw8q+={|SM4}$S!
zv@mx-evkI*q6LGGWOwWt6KVM&)(ubOPOJa}@^-uvUdYAxNc;j)!e=uqx8tp_A%DcL
y?eR9si9{4$Vx&c`Ci+^BQ_dg(35X$r;F)E~x-35@2KWi%gse+;K#%N8KK%_foe3oX

delta 629
zcmYjOOK;Oa5Z>{laqZX+2`?oykCqCVUQ$Y-6a+aGE(k6N357~&h+|}060~-Z3ihd$
z5L`G6T)5C2KuEoS${*my<G|hAk&qC-010N@D(Xt}?KiVCv-9n~seLI~ZPU~lt;f-2
zFFy3aItY`u$nCNwxU4BXVIH{PN}F0!PPyzVn;JIYr(IuKTwd?5^&ifMyxm#F1?k^i
zg-V6VWWg1JkZrIn7_xY`3yWZhZ9ptVY)gtDl7><Y#N`Nv5X-JiH?c@gbAZlSOL3JO
z%uxpyshM8gTUb%1@*{6V@P|^w;aDA?DrLBh@01m+W{kW8T+HM^qI$eHxX+JbO+9j=
zLosd>Tz6ESqdn0&YwaNLz4b&726tMitN@>9%7(%VB0EojzcZ!kVd05)<EDTT!2(&3
zC19#v-f3u`K>9U~vOY6br5LZ_Y5h_07}3PI*Y|sS-JRTS=L!6*&w+z~br<}dwow46
z;vjqGc%pauy!U`A!hlbUaycLgMPf8|I#nINXXmoX_^R)=g0LNSpP^>HR7iFKUz;c4
z6@E26sN<|P1#j`Db=5d8CQ8S@fZJ9Dw(*;FZDwC|bUxCU7=GaKZa00D_mn?@EB1Uv
iDCegHoD;ApKztRyB%pyG?X$9zoy9-)BuwLh+>8H?iIMsM

diff --git a/tracking/dotrack/__pycache__/dotracks_front.cpython-39.pyc b/tracking/dotrack/__pycache__/dotracks_front.cpython-39.pyc
index bb80b33d47072d4c2221ef311dd9a84b64080feb..36c4ddd49e237f0052bbf012cadf9a94634c75ad 100644
GIT binary patch
delta 307
zcmdm`uvdXQk(ZZ?0SLr6yf<>6VH7fPv5Ij?ElEu-2`NfU&d$tB-~5bm5({J0=1R6=
z79ka&QcbxcAs|(x4I;EA|KoD^jAE`dG`z)JVQ6#<$N~}-MutE!BaoPp5r}1Ui>bo!
z7E>h<R{+_SMz>f?^D^`EqF57)QWFg!lu^{?K5lU)D_xK+j79n&3m8FcCNNcGj9|ZH
z1G4?VB1OR<bp{~9X!3ntNfTQT(*#7A0*PDfX*v0cCB{a#I8*aVb5n~FOHzw0K@u#<
v`303l79fQxlXdvC8C54o@EJ2&PVV8m%dG<vRt6F2lS}wR7)>Uh<SzsOVMb0q

delta 301
zcmdn1uuFkEk(ZZ?0SM;RxNhV=!^m&wVii-FpOar^T2hploW1!a<0KZwTbpaxidlqI
zf$B8niiChvkq(H^p3KPY&UkCGC%3HjE#^uiqgzZBhPRk1fw%(5t~9#ETAG)cpLdHj
zu_!gs5JDN<+B}h4oT*+9WEx|U0mvXm5Ss~16`3H|FWG=>Kd?wqBuJehh%g2z;JYQ5
zlvtb^pPO2go*EB!YjKesNZJ%cm;s4f>}fgqi6zEHw>VStN`VR!OHzxhKoTs;`2`%6
sMV26ys+0Bkv>DYVNAnpoT21cfyUVQ$5>^Hgxs%KJLl{jbpW!bA0L?5<Q~&?~

diff --git a/tracking/dotrack/__pycache__/track_back.cpython-39.pyc b/tracking/dotrack/__pycache__/track_back.cpython-39.pyc
index c6bbe4ff59a96af01105bc25e834b6ed1d5b1168..2fa00a942bde83b75f6cd36f6760e472d8b80e52 100644
GIT binary patch
delta 1232
zcmZXT&u<$=6vyYy?5@{a?8JsTKOF3hLy9bwDk&1JC{hn`)IclRQl!EXY8=lxu}$n~
zb^~o$<5q<9QWc^32a*f79*V_*iW`3cqT=9ILU8N>#1X-P_tpgz*wuXYy?Jln%)amJ
zjpe&5=~^n~FuZ>M>SE*WiO<u&zP5{=&peRK<8t;EYk=fZ>?A!QOVW~w9q<e}CzH}a
z%an)YQ#;JFWJ;#-nUK%PjLc%hmh<`yEM#R-x)>O{#SG?+Ut;AWgPU*;vI~`$S1W$#
z*TXket=?{S*7ak45)y+s@d#k?OY<iIOZsPfA3VL2JPNhJy<{l?=k$Z|U!XnsHgns6
z^ZG)r0N?0tZq-`GZL2f-yIdJ6`j6ZaoYki%zMl93r-KCqOB!$l?`L>{J7O?42?E~I
znf%j^hru6lsCV?S{Hy&@A@WxV?-EWDt`Mq(6NC!kMZ$Z88exr4C!8fnf=_55%46y<
z+3SQ2LYDA6p-gBZJU6x3{Q$dB4L6h@Y<P#Bxb;pLs1|1E%*?btoF6kY=zOm$GjI1T
zv`idJID$Kfh_%=rgq)tAz&`W<EfK*K>*3s<5%GOk<vr0eLUYfG1ZIfXGSD(2(MqT_
z^zBGUCfTQ4LW55+jG2*$Ospaz19Nuc9HalgBqL73LXpwns5yUK0dA|D9NM9(wchtT
z!O(1Wq<=MT^3b7KJPKWPZJ62$t3g-`{c58rgHh}M(?~0B<j`o!tH)81K4U|RUTM~c
z33;tk+iccV7uQqM{~(XnFkkO(Zf#@bQF8T3ZoJT+m=H`N7|(*k)7(K?kOLcH^6T?!
zcuwQPdhB4G{((Yu`qIBIQbyp2mAQ=uDH5vz64j8r&9+>e11Zom+Oa+@-V)Mm8{HL*
zaA{#A(T3O?y=7ybpjgY0sK!eeHoMmkB#*r06fI~<G0EB{3d^^4BZ0#}A<e<@XHUUV
zOXYA|!$iZch1<$k<LHgfEbUp%Bg&(GtDOF<@JgzP-xti_G)r1S|4{e{f6zCICAgrs
zi)8;+yaXTXWw!)Z^oDy8?fb3^Yx<#kdg3ybEK*6X{<SlDadu_;LyAR&9sxyV>IUJa
kzB9WpNmAM(?K)YfU_16H=LM&1&)JLm!E6Orohq&W1)#?raR2}S

delta 823
zcmZ9~OH30%7zgnA_R($^D33^6D3o@ql8s6bLIff4K~Xd%(Qr`K3RGsxV{6+ipdv*e
zArccWW)7YWXT9tRPn<j%6HX>XV?22<(SsLaV&eC;iALMZumAtfOn18J%h8RIV79JK
zXZYH=q38B`o&~>OeT2<s7I0=syknc?fJ<E73Rp6ab07C_fu-;S4{#lm%4>M-7PEZ3
zjtBA6&kf$ln{Y<sNpTsv^=+mwtA3oBN4+PIhW5eK*-Xl|OKCgn7Um1HnU!L`c&~42
z$<59<;)~P|su!0(0Cai3l+QAp7oW5ja3D4VCt=ci6)^lTCiWY?!JN0(_*8*wVk{Jc
z*CHRv_%7km-BIx_WWtCz3=KnC425^YJ9v4q8({$jj^q1?6q9tttBrsho1i_de~41L
zg?yxt5htQo)~jDj{WdX4^b=FWG;xL)A$o}{afg^8IFTl7B1g<3X1&`?d5)MTnut!q
zBo+`${D`*oI8^h*U7|n~i4yVO`5W=tzPQjfv94m0aSY>Fe2kRY0^`uaxa6=>Yo*E9
z6o;(=Hdv6j>L|sFl(`RQ{0>xFb(e<gq{=#(tCd-`xb)B3Y74Z`os<xlBg|3P<T8{t
z$`THFO(`qh+t?r&>VZFJXP1^;+ik#;RUb==(lNwT-Dc4nAFBC@Ws!a$(?mJGihqT}
zxB;CanplO?;(1~m9*D0A1NubJxQ=<+h{J%`G|q)@;vTmHF(vnJZV>N{(dK2EyHBhT
l4~bPVkn9dcFlutJU2oE3nywA%UAn2A5}U~s-ug{)_BTOpvA_TT

diff --git a/tracking/dotrack/__pycache__/track_front.cpython-39.pyc b/tracking/dotrack/__pycache__/track_front.cpython-39.pyc
index 3e00ce8102c25172f550c82507a222267a695dfb..b990dd9ff223a8f87397f7b58b6005a362d982bd 100644
GIT binary patch
delta 295
zcmX@Bbx@Hnk(ZZ?0SJ}``J^pVnaFpQ&kx8;Wr$)-VTfW%5t#T<Rgo)&yM-Z&J%uNQ
z7f5rY@TKqrY0h>A7KSLUU<OUW&5n#djGVj$CGo{2i6yC%=P-Q{GIX(uaY-#nO)d#3
zN=(kq%uC<Ambr{&a~n?$6YI<WKroq|zm)41b7E5QE#{omyvc3+QyC{umJxW#cx^MA
zpehri>0}*Y312Iqdy0fXgeZvM0}=WlLLEd{0*PD9#ihBoSc>zDN{Y;Yd`+GrS&*DH
zkceVSNiB)5G$^tGi8xH2C>+jsYw}CsP)6>_ZX%Z4jv!$d5aB+#U&Me9WIP8mpDKqC
M2Rnz`<ntnR04X<3cmMzZ

delta 1464
zcmah}T}&fY6u$RPryZt0)Z!12#f-Zl*(yOwmKcqi7%*aji4lyZ?%K@u4s26s+1p_S
zGqqh|`B7ZKk+@5C4G?2?6CoxLMAFsllP~(<!@kU`OlhBpiSK&uOlc$<J<UD$o^#L7
zcfRS&{U?5TGNcBBG6FgK^QqyDGs~d|p|`=(P#jYfC$wq#_x7hArhXcj!EqlA($EZw
zOSF-OVQ-)h(FpAF9P*&Je-K3<*?tBO;Krt8c5Hk?*Ah8h)l*4xk^Is2eBX2D`!sEQ
zKvP*Jl^Hodl^xAq=}G8JO{TX$6Rvm)RS8-r1rDbsLD+q;dST^sjL-=D2+9k2kB-(b
zEMnkwY>+fs#}v1qyr>I?I1T4CVf}_@%|kJG@H8GK>lh<LFg(L#5E-Hq?bSs}+>B{b
z=tCD?%=-+{@U=jI;iIG(wIE6!LurA%YY1x|!+X+SE9zwAy_f4TRB-d$duSlkAX)zb
zsUUDnd>MjUpoPyW<r@qM<`I@K3%KcqR4eSFhvL%&z<1?km`^^24Q%+i?bggYxrW~e
zxVcOCa;wqca^ut<E%4&UuG(ZZx}u(mU0`2UYGN;ZQeK`Zf3bU1TAVuAD^}*esTLQ?
zAKyLL+gC1TCzZq18D%P_*teI;YjY5Eu=jcOR<U|>$=+JES7vSVs(tHDWoPqn;cn&L
z*Y@nS--;g=>g7`z`1j<FN~?7b?>hyKSf8RYrowTtemAZ%bxhMW_K%Fgp_hhU?M)2z
zzwz>5KV(<#-KqTez5Uh9!T$B??VIJzjl++2%f+jJwt8c}U>8dOqh2>Vq5m6<$`7VJ
zw-1Bb-)-6Rvyfze`zaJuPITi805hBRwdup1H874!^YAt>y+hG5^r*COxU*rGR_e`Q
zzJkKk%!rm#UQpgSI~nT$0;3(u-y=8+HTmCw&d$yY^;`xI4>A5`RsRHudRZ9GmiXQ!
zjcJykUd&m-XhF+ZUUhsN@L8e*B^qRH5EmDzrYEN2!4nf&UKeiM-6!KA_iaz4GBlOc
za+cqjmz&z8g;SO%MJHp9?zV8+@;Vo>+TP7h7dXb#T%F-6!aKvtb%8=*nKY9Cj$nyM
zB!Zi9E0*!2HBT#%aY%^ZFop;cg7yC6!z`Q8hxo^(^W@hkF`S~gBq!upI2R&9+oz;U
zL}cAynG5oS%+A4y^>9=2ui)$Em;NgLb$dS0PH?Ze6>7#k=1-xvr+Jtq<R-=}PcF-J
z)(3Vp;4sHtfpgsJ(AUNK!C(VsQ{!9sfthZ6Q^G9f#G3aTpAGYQ*=t<A&efnPhP%QX
Tnk0nUrHJH{g7P`DH~hh0&`+vC

diff --git a/tracking/dotrack/dotracks.py b/tracking/dotrack/dotracks.py
index 5372faf..a8d9802 100644
--- a/tracking/dotrack/dotracks.py
+++ b/tracking/dotrack/dotracks.py
@@ -216,7 +216,7 @@ class Track:
                         trajdist_min,  trajdist_max,
                         trajlen_rate, trajdist_rate]
         
-    def compute_static_fids(self, det_y, STATIC_THRESH = 8):
+    def pt_state_fids(self, det_y, STATIC_THRESH = 8):
         '''
         前摄时，y一般选择为 box 的 y1 坐标，且需限定商品在购物车内。
         inputs：
@@ -324,12 +324,15 @@ class doTracks:
         for t_id in self.trackID: 
             # print(f"The ID is: {t_id}")
             idx = np.where(track_ids == t_id)[0]
-            box = self.bboxes[idx, :]     
+            box = self.bboxes[idx, :]  
+            
+            assert len(set(box[:, 7])) == len(box), "Please check!!!"
 
             lboxes.append(box)
         
         return lboxes
     
+    '''
     def classify(self):
         
         tracks = self.tracks
@@ -354,10 +357,11 @@ class doTracks:
         self.Static.extend(static_tracks)
         
         
-        '''剔除静止目标后的 tracks'''
+        # 剔除静止目标后的 tracks
         tracks = self.sub_tracks(tracks, static_tracks)
         
         return tracks
+    '''
         
     
         
diff --git a/tracking/dotrack/dotracks_back.py b/tracking/dotrack/dotracks_back.py
index 8dfffe7..eab3da0 100644
--- a/tracking/dotrack/dotracks_back.py
+++ b/tracking/dotrack/dotracks_back.py
@@ -51,41 +51,29 @@ class doBackTracks(doTracks):
 #         return lboxes
 # =============================================================================
 
-            
-    
     def classify(self):
-        '''
-        功能：对 tracks 中元素分类
-        
-        '''
-        tracks = super().classify()
-        
-        # tracks = self.tracks
-        # shopcart = self.shopcart
+        '''功能：对 tracks 中元素分类 '''
 
-        # # 提取手的frame_id，并和动目标的frame_id 进行关联
-        # hand_tracks = [t for t in tracks if t.cls==0]
-        # self.Hands.extend(hand_tracks)
-        # tracks = self.sub_tracks(tracks, hand_tracks)
+        tracks = self.tracks
+        # 提取手的frame_id，并和动目标的frame_id 进行关联
+        hand_tracks = [t for t in tracks if t.cls==0]
+        self.Hands.extend(hand_tracks)
         
-        
-        
-        # # 提取小孩的track，并计算状态：left, right, incart
-        # kid_tracks = [t for t in tracks if t.cls==9]
-        # kid_states = [self.kid_state(t) for t in kid_tracks]
-        # self.Kids = [x for x in zip(kid_tracks, kid_states)]
-        
-        # tracks = self.sub_tracks(tracks, kid_tracks)
+        tracks = self.sub_tracks(tracks, hand_tracks)
 
+        # 提取小孩的track，并计算状态：left, right, incart
+        kid_tracks = [t for t in tracks if t.cls==9]
+        kid_states = [self.kid_state(t) for t in kid_tracks]
+        self.Kids = [x for x in zip(kid_tracks, kid_states)]
+        
+        tracks = self.sub_tracks(tracks, kid_tracks)
 
-        # static_tracks = [t for t in tracks if t.frnum>1 and t.is_static()] 
-        # self.Static.extend(static_tracks)
-        
-        
-        # '''剔除静止目标后的 tracks'''
-        # tracks = self.sub_tracks(tracks, static_tracks)
-        
+        static_tracks = [t for t in tracks if t.frnum>1 and t.is_static()] 
+        self.Static.extend(static_tracks)
         
+        '''剔除静止目标后的 tracks'''
+        tracks = self.sub_tracks(tracks, static_tracks)
+
         
         '''购物框边界外具有运动状态的干扰目标'''
         out_trcak = [t for t in tracks if t.is_OutTrack()]
diff --git a/tracking/dotrack/track_back.py b/tracking/dotrack/track_back.py
index 7b7d470..5edf008 100644
--- a/tracking/dotrack/track_back.py
+++ b/tracking/dotrack/track_back.py
@@ -31,7 +31,7 @@ class backTrack(Track):
         '''运动点帧索引(运动帧两端的静止帧索引)'''
         self.moving_index = self.compute_dynamic_fids()
         
-        self.static_dynamic_fids = self.compute_static_dynamic_fids()
+        # self.static_index, self.moving_index = self.compute_static_dynamic_fids()
         
         '''该函数依赖项: self.cornpoints，定义 4 个商品位置变量：
             self.Cent_isIncart, self.LB_isIncart, self.RB_isIncart
@@ -250,13 +250,35 @@ class backTrack(Track):
         return moving_index     
     
     def compute_static_dynamic_fids(self):
-        static_dynamic_fids = []
-        for traj in self.trajectory:
-            static, dynamic = self.compute_static_fids(traj)
+        
+        idx2 = self.trajlens.index(min(self.trajlens))            
+        trajmin = self.trajectory[idx2]
+        
+        static, dynamic = self.pt_state_fids(trajmin) 
+        
+        static = np.array(static)
+        dynamic = np.array(dynamic)
+        
+        if static.size:
+            indx = np.argsort(static[:, 0])
+            static = static[indx]
+        if dynamic.size:
+            indx = np.argsort(dynamic[:, 0])
+            dynamic = dynamic[indx]
             
-            static_dynamic_fids.append((static, dynamic))
-            
-        return static_dynamic_fids
+        return static, dynamic
+        
+        
+        
+        
+# =============================================================================
+#         static_dynamic_fids = []
+#         for traj in self.trajectory:
+#             static, dynamic = self.pt_state_fids(traj)            
+#             static_dynamic_fids.append((static, dynamic))
+#                
+#         return static_dynamic_fids
+# =============================================================================
     
     
     
@@ -270,6 +292,10 @@ class backTrack(Track):
                       trajlen_rate, trajdist_rate]
         '''
         
+        # print(f"TrackID: {self.tid}")
+        boxes = self.boxes
+        
+        
         condt1 = self.feature[5] < 0.2 or self.feature[3] < 120
         
         '''静态情况 2: 目标初始状态为静止，适当放宽关键点最小相对运动轨迹 < 0.5'''
diff --git a/tracking/dotrack/track_front.py b/tracking/dotrack/track_front.py
index 6ae7a75..42e5d0b 100644
--- a/tracking/dotrack/track_front.py
+++ b/tracking/dotrack/track_front.py
@@ -31,8 +31,8 @@ class frontTrack(Track):
         '''y1、y2静止状态区间，值是 boxes 中对 axis=0 的索引，不是帧索引'''
         det_y1 = np.diff(boxes[:, 1], axis=0)
         det_y2 = np.diff(boxes[:, 3], axis=0)
-        self.static_y1, self.dynamic_y1 = self.compute_static_fids(det_y1)
-        self.static_y2, self.dynamic_y2 = self.compute_static_fids(det_y2)
+        self.static_y1, self.dynamic_y1 = self.pt_state_fids(det_y1)
+        self.static_y2, self.dynamic_y2 = self.pt_state_fids(det_y2)
         
         self.isCornpoint = self.is_left_or_right_cornpoint()
         self.isBotmpoint = self.is_bottom_cornpoint()
diff --git a/tracking/test_tracking.py b/tracking/test_tracking.py
index 6a1fbb1..8fd5c4a 100644
--- a/tracking/test_tracking.py
+++ b/tracking/test_tracking.py
@@ -90,7 +90,7 @@ def have_tracked():
     k = 0
     gt = Profile()
     for filename in os.listdir(trackdict):
-        filename = 'test_20240402-173935_6920152400975_front_174037379.pkl'
+        filename = 'test_20240402-173935_6920152400975_back_174037372.pkl'
         file, ext = os.path.splitext(filename)
         filepath = os.path.join(trackdict, filename)
         TracksDict = np.load(filepath, allow_pickle=True)
@@ -121,9 +121,9 @@ def have_tracked():
         
         
         
-        # k += 1
-        # if k==1:
-        #     break
+        k += 1
+        if k==1:
+            break
     
     if len(alltracks):
         drawFeatures(alltracks, save_dir)
diff --git a/tracking/trackers/__pycache__/byte_tracker.cpython-39.pyc b/tracking/trackers/__pycache__/byte_tracker.cpython-39.pyc
index d43866da8ae80ee564630f1d281cac4533780e74..aabb35137903339351c91b49fe1d6b0b096252fe 100644
GIT binary patch
delta 1200
zcmb7@&ubG=5Xax_rcIhAX__{_+NAl>rmg)Y)>=gH$02$zh=<Y|ZMV^GG?HWym3aiL
zViW_BM+Lz{q9C;gMT3F|L9mDiQBXky#ecwmz(dv9O^gw}nDBPyy*K;j^PPG7<>dLa
z{ixk;W%T=ge<peQf&DYMw#RqP#h0|DMeShr=wfO)eXRNoGChuAifW}H)5x6=X9AJ@
zF~-dZDsT%uCEi9)nOo6<Of{)3DHCt6`>o{L8taVPHFMd5HndkH?m#O#{ET;yZ71ub
zINf%V)z@9vX3V?D>ho@7<u-I;C+_Y-sbad!2*XXoLusvXHXr6*^s4Q-m*_6r&|3ju
znTP0U@>$uA9x)RP=6zZx`U+5BD>C<KF0~7N27I?76{R_u`*{!VML(T-cuwL09xMO`
z2*O)n7$n<AncSL3^`@i}WRIY??881ffmI}6DF4ct4p5xGwxh_3sVLK~scg&F@Jf&g
z8>%|ch26R+9=ZfcP+FAM3l{8&vlZZB%~kHfFovjR2Da}1##YQt$dP7biZhTg^cQko
z%DVoSxq<vv2b-VZQA!ZiYf`U8Z%Qsn*=agAP+_FA<yRF-QfB%RBUu(hR&Si;SKu-u
z<xX@LsAP3r<TvSRYv}5)w_>8!3Uuqb%D!4F{wTV!qc@&Xu3<l6P7<cOj!Eqy)S!<k
zd27l<te=Rr&tPqBV*P|fIDdc-P=bNFzL0S{!YNjgvr{EG(@k$iXf66jdgIQaxp9^r
z$5aQMHbzxyq(|1L_7i}dUHAupoLLZ?q1FA<^unNGR~#25Kh-KRsB}>I$kQ)7-HVvw
zH0EYwHmI4^Ef~W=FC%Y6=`2co2#3Un@K*?ljmTBlDQ2SQ;E;F~eFiB}?0*31>fQkk
zFf5+N_Bm#4$>nTLOC*=m%92vuj2#E(27U5Oa)7D!mqc#pipeTD<m!*11i)#L*zyR9
zRrkm+fDn5|Pr)^DZ}c0iinXz`a8pFbAHyy2ar_3{spcjk0PEG&t(ySPDb^$IZd-v3
jF+Mp9PpXB<+W_yx*wig}FWyXDhZiEb<2A&@j_LKE7g|Pj

delta 1164
zcmb7@O-xfk5XX1kE3_2)T1r2mg?>Q!Mr?qn@!+AH)r12vd<1*}Z57hen4q(10vd_|
z(_|InLDTwi(ZqyQjVHy#o2JHt2^ZqkgC}n$m^klIu!NKEW#7#1PIrF)neEct_p6pE
zi^a_7nVyZ!*f%XZVC|2c8e5#dGJkC_otnCsDDFbCQE8`;Y8o<)g$Z%P7tA2Ufg9;7
zaT9%IUV}ztaYMW+Vc_PnUrm1P!8+r0X=C1mwOCh>xCLv_;$>VRYbI-@IL+F~YU}lA
z(&u)v+Pnc-z6PymLpw@^lZI6`%eaGvlhT@FY&^hS=!(}ad_+gS4qXKRmVAlM3ZLaI
z=oF)Vf5x4zM|T#oY+2^+v_0N{ZXMpCO6$^?%st%88_`3jPK-&siTkpEO$6b}GW3!4
zQzmEH6?Z439Hhq3mG_{ZPGAKI7|Q!O=X@0B-P=)R)vzwpt|4ES*~800(x<CZupS#o
zm4P>}zznEWYV}PMdSh%EcuU%zZ^RaCrkd&4n*R@5HC7-8Dv>EpN5<wO$Qdc6{4etX
za!CUl@8dyA5Y%c?u0>Nq&Pk~#o$D(w(pj}%g`AX(t}v2i(q%QqSY{bk87a4+BTFSK
z>mt8GSIvR0P`MR-d#yl+rYrB+YsI0W>pNQGDdkfP5oVMy9c4^v525-!OwE`R24dYN
z)@Gfxx`K5ZiE#Wh4^x70Szn8OI|2!olT-aUIccL`25BvHD7}8?^j#KL=!_n!%|TM~
z!jx4`jiAeMB(0nr5lZ0Ra0i7&REw(IlDt%*$%tyDqLHUvak>qys!gBE`m8N&jCW!y
zwz(O3U26Th#3L9HKLS6&FTMrWU`R}duETk;6WW3q@hH3rmy73GIY7H8wVf&YB9}nf
zqJK4$6fo$oxZ8ePQlw(2V-g@KmO5WUws@ke1K^IB>Yj%+@wNLm<iw|*MYu19d*8rA
zvD^Cq3dN1SAi%TY+hczK-chVed_KMm@5Q<31$b3_5q$zs5@!b<!x!;uU;{pg)xi=3
I#OToTzf>YR2LJ#7

diff --git a/tracking/trackers/byte_tracker.py b/tracking/trackers/byte_tracker.py
index d33a3dc..dd2a9e0 100644
--- a/tracking/trackers/byte_tracker.py
+++ b/tracking/trackers/byte_tracker.py
@@ -214,6 +214,8 @@ class BYTETracker:
         refind_stracks = []
         lost_stracks = []
         removed_stracks = []
+        
+        first_finded = []
 
         scores = results.conf
         cls = results.cls
@@ -328,6 +330,9 @@ class BYTETracker:
                 continue
             track.activate(self.kalman_filter, self.frame_id)
             activated_stracks.append(track)
+            
+            first_finded.append(track)
+            
         # Step 5: Update state
         for track in self.lost_stracks:
             if self.frame_id - track.end_frame > self.max_time_lost:
@@ -359,7 +364,7 @@ class BYTETracker:
                               for x in self.tracked_stracks if x.is_activated]
         
         output2 = [x.tlwh_to_tlbr(x._tlwh).tolist() + [x.track_id, x.score, x.cls, x.frame_id, x.idx] 
-                              for x in activated_stracks if x.first_find]
+                              for x in first_finded if x.first_find]
         
         output = np.asarray(output1+output2, dtype=np.float32)
 
diff --git a/tracking/utils/__pycache__/drawtracks.cpython-39.pyc b/tracking/utils/__pycache__/drawtracks.cpython-39.pyc
index c84111b13f9f2bf400a801642b94e6b22f4de41d..915f2cbb06f58b22638c2c0588e5f538d5d031ff 100644
GIT binary patch
delta 3072
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

delta 2798
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

diff --git a/tracking/utils/drawtracks.py b/tracking/utils/drawtracks.py
index 0ca7d8b..436e2c5 100644
--- a/tracking/utils/drawtracks.py
+++ b/tracking/utils/drawtracks.py
@@ -11,6 +11,7 @@ import matplotlib.pyplot as plt
 from sklearn.decomposition import PCA
 from utils.annotator import TrackAnnotator
 from utils.plotting import colors
+from pathlib import Path
 
 
 def plot_frameID_y2(vts):
@@ -88,14 +89,18 @@ def draw_all_trajectories(vts, edgeline, save_dir, filename):
     
 # =============================================================================
 #     '''1. tracks 5点轨迹'''
+#     trackpth = save_dir.parent /Path("trajectory")/ Path(f"{file}")
+#     if not trackpth.exists():
+#         trackpth.mkdir(parents=True, exist_ok=True)
 #     for track in vts.tracks:
-#         if track.cls != 0:
-#             img = edgeline.copy()
-#             img = draw5points(track, img)
-#             pth = save_dir.joinpath(f"{file}_{track.tid}.png")
-#             cv2.imwrite(pth, img)
+#         # if track.cls != 0:
+#         img = edgeline.copy()
+#         img = draw5points(track, img)
+# 
+#         pth = trackpth.joinpath(f"{track.tid}.png")        
+#         cv2.imwrite(str(pth), img)
+#     
 # =============================================================================
-    
     '''2. all tracks 中心轨迹'''
     img1, img2 = edgeline.copy(), edgeline.copy()