pyppbox 3.6b9__tar.gz → 3.7b1__tar.gz

{pyppbox-3.6b9/pyppbox.egg-info → pyppbox-3.7b1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyppbox
-Version: 3.6b9
+Version: 3.7b1
 Summary: Toolbox for people detecting, tracking, and re-identifying.
 Home-page: https://github.com/rathaumons/pyppbox
 Author: Ratha SIV

{pyppbox-3.6b9 → pyppbox-3.7b1}/RELEASENOTES.md

@@ -12,7 +12,14 @@
 
 ## **pyppbox V3 - Make Simpler and Faster**
 
-* `pyppbox` [v3.6b9](https://github.com/rathaumons/pyppbox/tree/v3.6b9) - The Last V3
+* `pyppbox` [v3.7b1](https://github.com/rathaumons/pyppbox/tree/v3.7b1) - The Last V3
+
+  - Sync `pyppbox.utils.persontools.Person`'s misc across frames in all trackers
+  - Improve and add `--use-numid` for using number id in MOT as the real id in `pyppbox` format
+  - **Known issue/limitation**:
+    - You tell me :)
+
+* `pyppbox` [v3.6b9](https://github.com/rathaumons/pyppbox/tree/v3.6b9) - ~~The Last V3~~
 
   - Fix `setMainTracker()` and `setMainReIDer()` for default input
   - Correct `show_ids` documentation in `visualizePeople()`

{pyppbox-3.6b9 → pyppbox-3.7b1}/pyppbox/__init__.py

@@ -47,7 +47,7 @@ from pyppbox.gui.guitools import (
 )
 
 
-__version__ = '3.6b9'
+__version__ = '3.7b1'
 __author__ = 'Ratha SIV'
 __description__ = 'Toolbox for people detecting, tracking, and re-identifying.'
 __homepage__ = 'https://rathaumons.github.io/pyppbox'

{pyppbox-3.6b9 → pyppbox-3.7b1}/pyppbox/modules/trackers/centroid/__init__.py

@@ -103,6 +103,7 @@ class MyCentroid(object):
                                     self.previous_list[pindex].faceid_conf,
                                     self.previous_list[pindex].deepid_conf
                                 )
+                                self.current_list[i].misc = self.previous_list[pindex].misc
                                 self.used_cids.append(prev_cid)
                                 # self.previous_list.pop(pindex)
                         else:

{pyppbox-3.6b9 → pyppbox-3.7b1}/pyppbox/modules/trackers/deepsort/__init__.py

@@ -149,6 +149,7 @@ class MyDeepSORT(object):
                             self.current_list[cindex].deepid = self.previous_list[pindex].deepid
                             self.current_list[cindex].faceid_conf = self.previous_list[pindex].faceid_conf
                             self.current_list[cindex].deepid_conf = self.previous_list[pindex].deepid_conf
+                            self.current_list[cindex].misc = self.previous_list[pindex].misc
             else:
                 msg = ("MyDeepSORT : update() -> The element of input 'person_list' " + 
                        "list has unsupported type.")

{pyppbox-3.6b9 → pyppbox-3.7b1}/pyppbox/modules/trackers/sort/__init__.py

@@ -110,6 +110,7 @@ class MySORT(object):
                             self.current_list[i].deepid = self.previous_list[pindex].deepid
                             self.current_list[i].faceid_conf = self.previous_list[pindex].faceid_conf
                             self.current_list[i].deepid_conf = self.previous_list[pindex].deepid_conf
+                            self.current_list[i].misc = self.previous_list[pindex].misc
             else:
                 msg = ("MySORT : update() -> The element of input 'person_list' list " + 
                        "has unsupported type.")

{pyppbox-3.6b9 → pyppbox-3.7b1}/pyppbox/utils/evatools.py

@@ -341,9 +341,25 @@ class NothingTracker(object):
     A class acted as a tracker which does not perform any tracking. 
     """
     def __init__(self):
-        pass
+        self.previous_list = []
+        self.current_list = []
+    def _getIndex(self, deepid):
+        pindex = -1
+        for i in range(0, len(self.previous_list)):
+            if deepid == self.previous_list[i].deepid:
+                pindex = i
+                break
+        return pindex
     def update(self, pp, img=None):
-        return pp
+        self.previous_list = self.current_list
+        self.current_list = pp
+        for i in range (0, len(self.current_list)):
+            if len(self.previous_list) > 0:
+                pindex = self._getIndex(self.current_list[i].deepid)
+                if pindex >= 0:
+                    self.current_list[i].misc = self.previous_list[pindex].misc
+
+        return self.current_list
 
 
 class NothingReider(object):

{pyppbox-3.6b9 → pyppbox-3.7b1}/pyppbox/utils/mot2pyppbox.py

@@ -47,12 +47,16 @@ def remove_from_splitter(input_line, splitter=',', from_spl=6, with_newline=Fals
     if with_newline: res = res + "\n"
     return res
 
-# step 2: replace 2nd colum with repspoint and readID
-def replace_column_with(input_line, splitter=',', column_index=2, with_str="(0, 0)	XXX", with_newline=False):
+# step 2: replace 2nd colum with repspoint and realID
+def replace_column_with(input_line, splitter=',', column_index=2, with_str="(0, 0)	XXX", use_numid=True, with_newline=False):
     """
     :meta private:
     """
     spl_indexs = [i for i, char in enumerate(input_line) if char == splitter]
+    if use_numid:
+        num_id = input_line[spl_indexs[0] + 1:spl_indexs[1]]
+        with_str = with_str.replace("XXX", str(num_id))
+        # print(f"with_str = {with_str}")
     res = input_line[0:spl_indexs[column_index - 2] + 1] + with_str + input_line[spl_indexs[column_index - 1]:]
     if with_newline: res = res + "\n"
     return res
@@ -81,11 +85,12 @@ def finalize(input_line, splitter=',', find_repspoint=True, alt_repspoint=False,
     return res
 
 # AIO
-def convert(input_file="det.txt", 
-            output_file="det_pyppbox.txt", 
-            splitter=',', 
-            min_conf=0.25, 
-            max_conf=1.00, 
+def convert(input_file="gt.txt", 
+            output_file="gt_pyppbox.txt", 
+            splitter=',',
+            use_numid=True,  
+            min_conf=0.0, 
+            max_conf=1.0, 
             find_repspoint=True, 
             alt_repspoint=False, 
             alt_repspoint_top=True):
@@ -93,15 +98,17 @@ def convert(input_file="det.txt",
 
     Parameters
     ----------
-    input_file : str, default="det.txt"
+    input_file : str, default="gt.txt"
         Input MOT Challenge text file.
-    output_file : str, default="det_pyppbox.txt"
+    output_file : str, default="gt_pyppbox.txt"
         Output pyppbox text file.
     splitter : str, default=','
         Column or data splitter.
-    min_conf : float, default=0.25
+    use_numid : bool, default=False
+        Whether to use number id as real id.
+    min_conf : float, default=0.0
         Filter for minimum conf.
-    max_conf : float, default=1.00
+    max_conf : float, default=1.0
         Filter for maximum conf.
     find_repspoint : bool, default=True
         Whether to calculate repspoint.
@@ -119,7 +126,7 @@ def convert(input_file="det.txt",
                     line = line.replace("\r", "")
                     line = line.replace("\n", "")
                     line = remove_from_splitter(line, splitter=splitter)
-                    line = replace_column_with(line, splitter=splitter)
+                    line = replace_column_with(line, splitter=splitter, use_numid=use_numid)
                     line = finalize(line, 
                                     splitter=splitter, 
                                     find_repspoint=find_repspoint, 
@@ -136,19 +143,21 @@ if __name__ == "__main__":
 
     parser = argparse.ArgumentParser(description="Convert ground-truth of MOT Challenge text file to pyppbox format.")
 
-    parser.add_argument("--input-file", type=str, default="det.txt", help="Input MOT Challenge text file")
-    parser.add_argument("--output-file", type=str, default="det_pyppbox.txt", help="Output pyppbox text file")
+    parser.add_argument("input_file", type=str, default="gt.txt", help="Input MOT Challenge text file")
+    parser.add_argument("output_file", type=str, default="gt_pyppbox.txt", help="Output pyppbox text file")
     parser.add_argument("--splitter", type=str, default=',', help="Column or data splitter")
-    parser.add_argument("--min-conf", type=float, default='0.25', help="Filter for minimum conf")
-    parser.add_argument("--max-conf", type=float, default='1.00', help="Filter for maximum conf")
-    parser.add_argument("--find-repspoint", type=bool, default=True, help="Whether to calculate repspoint")
-    parser.add_argument("--alt-repspoint", type=bool, default=False, help="Whether to use alternative repspoint")
-    parser.add_argument("--alt-repspoint-top", type=bool, default=True, help="Whether y is the top for alternative repspoint")
+    parser.add_argument("--use-numid", type=lambda s: s.lower() in ['true', 't', 'yes', '1'], default=1, help="Whether to use number id as real id")
+    parser.add_argument("--min-conf", type=float, default='0.0', help="Filter for minimum conf")
+    parser.add_argument("--max-conf", type=float, default='1.0', help="Filter for maximum conf")
+    parser.add_argument("--find-repspoint", type=lambda s: s.lower() in ['true', 't', 'yes', '1'], default=1, help="Whether to calculate repspoint")
+    parser.add_argument("--alt-repspoint", type=lambda s: s.lower() in ['true', 't', 'yes', '1'], default=0, help="Whether to use alternative repspoint")
+    parser.add_argument("--alt-repspoint-top", type=lambda s: s.lower() in ['true', 't', 'yes', '1'], default=1, help="Whether y is the top for alternative repspoint")
 
     args = parser.parse_args()
     convert(input_file=args.input_file, 
             output_file=args.output_file, 
             splitter=args.splitter, 
+            use_numid=args.use_numid, 
             min_conf=args.min_conf, 
             max_conf=args.max_conf, 
             find_repspoint=args.find_repspoint, 

{pyppbox-3.6b9 → pyppbox-3.7b1/pyppbox.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyppbox
-Version: 3.6b9
+Version: 3.7b1
 Summary: Toolbox for people detecting, tracking, and re-identifying.
 Home-page: https://github.com/rathaumons/pyppbox
 Author: Ratha SIV