Merge branch 'devel-noetic' of https://github.com/Extended-Object-Detection-ROS/object_spatial_tools_ros into devel-noetic

Author: robofob

src/object_spatial_tools_ros/robot_kf_undirected_object_tracker.py

@@ -30,7 +30,7 @@ def __init__(self, x_start, t_start, Q_diag, R_diag, k_decay, color, score):
         self.x = np.array([x_start[0], x_start[1], 0.0, 0.0])
         self.last_t = t_start
         self.last_upd_t = t_start
-        self.last_soft_update = None
+        self.last_soft_update = t_start
         self.Q = np.diag(Q_diag)
         self.R = np.diag(R_diag)
         self.k_decay = k_decay
@@ -81,10 +81,10 @@ def predict(self, t):
     def update(self, z, t, score, soft = False):
         self.last_upd_t = t
 
-        if soft:
+        if not soft:
             self.last_soft_update = t
-        else:
-            self.last_soft_update = None
+        #else:
+            #self.last_soft_update = None
 
         y = z - np.matmul(self.H, self.x)
 
@@ -167,7 +167,9 @@ def process(self, event):
             for i, kf in enumerate(kfs):
 
                 regular_cond = self.lifetime == 0 or (now - kf.last_upd_t) < self.lifetime
-                soft_cond = (kf.last_soft_update is None) or (now - kf.last_soft_update) < self.lifetime_soft
+                soft_cond = (now - kf.last_soft_update) < self.lifetime_soft
+                
+                #rospy.logerr(f"soft cond {soft_cond} time {now} {kf.last_soft_update}")
 
                 if regular_cond and soft_cond:
                     kf.predict(now)