Added 2D-plane vector calculations in fall detection algorithm

Author: cwlroda

core/falldetector.py

@@ -1,5 +1,7 @@
+import math
 import logging
 from collections import OrderedDict
+from queue import Queue
 
 LOG = logging.getLogger(__name__)
 
@@ -11,31 +13,31 @@ def __init__(self):
     def update(self, persons, framecount, fps):
         self.falls = OrderedDict()
 
-        for ID, (x, y, x_, y_, w_, h_, l_knee, r_knee) in persons.items():
+        for ID, (x, y, x_, y_, w_, h_) in persons.items():
             if framecount == 0:
-                self.old_persons[ID] = (x, y, h_, False)
+                self.old_persons[ID] = (x, y, w_, h_, False)
 
             else:
                 if ID in self.old_persons:
-                    (old_x, old_y, old_h, fall) = self.old_persons[ID]
-                    
-                    if w_ >= h_:
-                        if (l_knee != 0 or r_knee != 0) and y-old_y >= old_h/2:
+                    (old_x, old_y, old_w, old_h, fall) = self.old_persons[ID]
+
+                    if w_ >= 1.2*h_:
+                        if math.sqrt(pow(abs(x-old_x), 2)+pow((y-old_y), 2)) >= 0.7*math.sqrt(pow(old_w, 2)+pow(old_h, 2)):
                             LOG.info("FALL DETECTED")
                             self.falls[ID] = (x_, y_, w_, h_)
-                            self.old_persons[ID] = (x, y, old_h, True)
+                            self.old_persons[ID] = (x, y, old_w, old_h, True)
 
                         elif fall:
                             self.falls[ID] = (x_, y_, w_, h_)
 
-                    elif framecount % round(fps) == 0:
-                        self.old_persons[ID] = (x, y, h_, False)
+                    elif framecount % int(fps) == 0:
+                        self.old_persons[ID] = (x, y, w_, h_, False)
 
                     else:
-                        self.old_persons[ID] = (old_x, old_y, old_h, False)
+                        self.old_persons[ID] = (old_x, old_y, old_w, old_h, False)
 
                 else:
-                    self.old_persons[ID] = (x, y, h_, False)
+                    self.old_persons[ID] = (x, y, w_, h_, False)
 
         return self.falls
 

core/tracker.py

@@ -7,11 +7,10 @@
 
 
 class CentroidTracker():
-    def __init__(self, frame_threshold=30):
+    def __init__(self):
         self.ID = 0
         self.objects = OrderedDict()
         self.disappeared = OrderedDict()
-        self.frame_threshold = frame_threshold
 
     def register(self, centroid):
         self.objects[self.ID] = centroid
@@ -22,12 +21,12 @@ def deregister(self, ID):
         del self.objects[ID]
         del self.disappeared[ID]
 
-    def update(self, inputCentroids):
+    def update(self, inputCentroids, frame_threshold):
         if len(inputCentroids) == 0:
             for ID in list(self.disappeared.keys()):
                 self.disappeared[ID] += 1
 
-                if self.disappeared[ID] > self.frame_threshold:
+                if self.disappeared[ID] > 2*frame_threshold:
                     self.deregister(ID)
 
             return self.objects
@@ -66,7 +65,7 @@ def update(self, inputCentroids):
                     ID = IDs[row]
                     self.disappeared[ID] += 1
 
-                    if self.disappeared[ID] > self.frame_threshold:
+                    if self.disappeared[ID] > 2*frame_threshold:
                         self.deregister(ID)
 
             else: