From 277c1deb6044d3ff3d7f07821561331845f6d048 Mon Sep 17 00:00:00 2001
From: sipp11 <sipp11@zzyzx.co>
Date: Sat, 26 Oct 2019 05:44:46 +0900
Subject: [PATCH] wip

---
 src/utils.py | 57 +++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 41 insertions(+), 16 deletions(-)

diff --git a/src/utils.py b/src/utils.py
index 4fa157d..0857bd0 100755
--- a/src/utils.py
+++ b/src/utils.py
@@ -1,5 +1,16 @@
 import collections
 import math
+from collections import namedtuple
+
+Rectangle = namedtuple("Rectangle", "xmin ymin xmax ymax")
+
+def area(a, b):
+    # returns None if rectangles don't intersect
+    dx = min(a.xmax, b.xmax) - max(a.xmin, b.xmin)
+    dy = min(a.ymax, b.ymax) - max(a.ymin, b.ymin)
+    if (dx >= 0) and (dy >= 0):
+        return dx * dy
+
 
 # detecting area
 AREAS = [
@@ -40,7 +51,7 @@ AREAS = [
     ],
     [
         ("id", 7),
-        ("area", ((555, 170), (720, 295))),
+        ("area", ((555, 170), (700, 295))),
         ("target", ["person", "wheelchair", "bicycle"]),
         ("next", [4]),
     ],
@@ -96,12 +107,12 @@ OBJ_LEAVING_COND = [
         ("duration_to_next", 30 * 4),
     ],
     [
-        ('origin_id', 5),
-        ('heading', 'N'),
-        ('x', 715),
-        ('y', -1),
-        ('next_area', [11]),
-        ('duration_to_next', 30 * 3)
+        ("origin_id", 5),
+        ("heading", "N"),
+        ("x", 715),
+        ("y", -1),
+        ("next_area", [11]),
+        ("duration_to_next", 30 * 3),
     ],
     # [
     #     ('origin_id', ),
@@ -174,23 +185,30 @@ def is_it_the_same_obj(x1, y1, w1, h1, i1, j1, w2, h2, **kwargs):
     object and of course, dimension too.
     """
     _id = kwargs.get("id", None)
-    # if _id:
-    #     print(" :: check against id:", _id)
+    if _id:
+        print(" :: check against id:", _id, end="")
+
+    # if first coords are pretty much the same spot, then they are the same
+    if abs(x1 - i1)/x1 < 0.05 and abs(y1 - j1)/y1 < 0.05:
+        print(" same 1st coords")
+        return True
+
     DIMENSION_SHIFT = 0.15
     # we have to use centroid !! from the experience
     cx1, cy1, cx2, cy2 = x1 + w1 / 2, y1 + h1 / 2, i1 + w2 / 2, j1 + h2 / 2
 
     c_dff_x, c_dff_y = abs(cx2 - cx1), abs(cy2 - cy1)
     w_shift, h_shift = w1 * DIMENSION_SHIFT, h1 * DIMENSION_SHIFT
-    # print(" ::SAME:: shift")
-    # print(f" ---> SHIFT --> w:{w_shift}, h:{h_shift}")
-    # print(f" ---> centroid  {c_dff_x}, {c_dff_y}")
+    print(" ::SAME:: shift", end="")
+    print(f" | SHIFT w:{w_shift},h:{h_shift}", end="")
+    print(f" | centroid  {c_dff_x}, {c_dff_y}", end="")
     if c_dff_x > w_shift and c_dff_y > h_shift:
         # print(" ::SAME:: shift too much already -- NOT THE SAME")
         return False
 
+    first_w_smaller = i1 > x1 and (w1 - w2) > (i1 - x1)
     # if one inside the other
-    if i1 > x1 and (w1 - w2) > i1 - x1 and j1 > y1 and h1 - h2 > j1 - y1:
+    if i1 > x1 and (w1 - w2) > (i1 - x1) and j1 > y1 and h1 - h2 > j1 - y1:
         # one is inside the other
         # print(" ::SAME:: new one inside existing tracker")
         return True
@@ -199,16 +217,23 @@ def is_it_the_same_obj(x1, y1, w1, h1, i1, j1, w2, h2, **kwargs):
         # print(" ::SAME:: existing tracker inside new tracker")
         return True
 
+    # if it's 90% overlapped then, assumed it's the same
+    # ra = Rectangle(x1, y1, x1 + w1, y1 + h1)
+    # rb = Rectangle(i1, j1, i1 + w2, j1 + w2)
+    # print(f'overlapped area: {area(ra, rb)} 1:{w1*h1:.1f} 1:{w2*h2:.1f}')
+    # print(f'||one {x1},{y1},{w1},{h1} two {i1},{j1},{w2},{h2}||')
+
     # if it's not inside the other, then we can use "size" if it's different
     size1, size2 = w1 * h1, w2 * h2
     # if size is larger than 20%, then it's not the same thing
-    # print(f" ---> size  {size1}, {size2}, diff % : {abs(size2 - size1)/size1}")
     # print(" ::SAME:: size")
     if abs(size2 - size1) / size1 > 0.45:
-        # print(" ::SAME:: too diff in size -- NOT THE SAME")
+        print(f" sz {size1}, {size2}, diff%{abs(size2 - size1)/size1}", end="")
+        print(" ^^ too diff in size -- NOT THE SAME", end="")
         return False
 
-    # print(" ::SAME:: last")
+    print(" ::SAME:: last")
+    print("")
     return True