Min_travel restriction

app.py

@@ -27,7 +27,7 @@ result = {}
 
 
 # Called when an Aris file is uploaded for inference
-def on_aris_input(file_list, model_id, conf_thresh, iou_thresh, min_hits, max_age, use_associative, boost_power, boost_decay, min_length):
+def on_aris_input(file_list, model_id, conf_thresh, iou_thresh, min_hits, max_age, use_associative, boost_power, boost_decay, min_length, min_travel):
 
     # Reset Result
     reset_state(result, state)
@@ -42,7 +42,8 @@ def on_aris_input(file_list, model_id, conf_thresh, iou_thresh, min_hits, max_ag
         'use_associative_tracking': use_associative,
         'boost_power': boost_power,
         'boost_decay': boost_decay,
-        'min_length': min_length
+        'min_length': min_length,
+        'min_travel': min_travel
     }
 
     print(" ")

gradio_scripts/upload_ui.py

@@ -39,7 +39,9 @@ def Upload_Gradio(gradio_components):
                     settings.append(gr.Slider(0, 1, value=1, label="Boost Decay", info=""))
 
                 gr.Markdown("Other")
-                settings.append(gr.Slider(0, 3, value=0.3, label="Min Length", info="Minimum length of fish (meters) in order for it to count"))
+                with gr.Row():
+                    settings.append(gr.Slider(0, 3, value=0.3, label="Min Length", info="Minimum length of fish (meters) in order for it to count"))
+                    settings.append(gr.Slider(0, 5, value=1, label="Min Travel", info="Minimum travel distance of track (meters) in order for it to count"))
 
                 gradio_components['hyperparams'] = settings
 

inference.py

@@ -32,6 +32,7 @@ MAX_AGE = 14 # time until missing fish get's new id
 MIN_HITS = 16 # minimum number of frames with a specific fish for it to count
 MIN_LENGTH = 0.3 # minimum fish length, in meters
 IOU_THRES = 0.01 # IOU threshold for tracking
+MIN_TRAVEL = -1 # Minimum distance a track has to travel
 ###
 
 def norm(bbox, w, h):
@@ -62,6 +63,7 @@ def do_full_inference(dataloader, image_meter_width, image_meter_height, gp=None
     if 'boost_decay' not in hyperparams: hyperparams['maxboost_decay_age'] = 1
     if 'AT_decay' not in hyperparams: hyperparams['AT_decay'] = MIN_HITS
     if 'min_length' not in hyperparams: hyperparams['min_length'] = MIN_LENGTH
+    if 'min_travel' not in hyperparams: hyperparams['min_travel'] = MIN_TRAVEL
     
     model, device = setup_model(hyperparams['model'])
 
@@ -101,7 +103,7 @@ def do_full_inference(dataloader, image_meter_width, image_meter_height, gp=None
 
     all_preds, real_width, real_height = format_predictions(image_shapes, outputs, width, height, gp=gp)
 
-    results = do_tracking(all_preds, image_meter_width, image_meter_height, min_hits=hyperparams['min_hits'], max_age=hyperparams['max_age'], min_length=hyperparams['min_length'], gp=gp)
+    results = do_tracking(all_preds, image_meter_width, image_meter_height, min_hits=hyperparams['min_hits'], max_age=hyperparams['max_age'], min_length=hyperparams['min_length'], min_travel=hyperparams['min_travel'], gp=gp)
 
     return results
     
@@ -308,7 +310,7 @@ def boost_frame(safe_frame, base_frame, dt, power=1, decay=1):
     base_frame[:, 4] *= 1 + power*(score)*math.exp(-decay*(dt*dt-1))
     return base_frame
 
-def do_tracking(all_preds, image_meter_width, image_meter_height, gp=None, max_age=MAX_AGE, iou_thres=IOU_THRES, min_hits=MIN_HITS, min_length=MIN_LENGTH, verbose=True): 
+def do_tracking(all_preds, image_meter_width, image_meter_height, gp=None, max_age=MAX_AGE, iou_thres=IOU_THRES, min_hits=MIN_HITS, min_length=MIN_LENGTH, min_travel=MIN_TRAVEL, verbose=True): 
 
     if (gp): gp(0, "Tracking...")
 
@@ -332,11 +334,11 @@ def do_tracking(all_preds, image_meter_width, image_meter_height, gp=None, max_a
                 tracker.update()
             pbar.update(1)
 
-    json_data = tracker.finalize(min_length=min_length)
+    json_data = tracker.finalize(min_length=min_length, min_travel=min_travel)
 
     return json_data
 
-def do_associative_tracking(low_preds, high_preds, image_meter_width, image_meter_height, reverse=False, gp=None, max_age=MAX_AGE, iou_thres=IOU_THRES, min_hits=MIN_HITS, min_length=MIN_LENGTH, verbose=True):
+def do_associative_tracking(low_preds, high_preds, image_meter_width, image_meter_height, reverse=False, gp=None, max_age=MAX_AGE, iou_thres=IOU_THRES, min_hits=MIN_HITS, min_length=MIN_LENGTH, min_travel=MIN_TRAVEL, verbose=True):
 
     if (gp): gp(0, "Tracking...")
 
@@ -363,7 +365,7 @@ def do_associative_tracking(low_preds, high_preds, image_meter_width, image_mete
                 tracker.update((np.empty((0, 5)), np.empty((0, 5))))
             pbar.update(1)
 
-    json_data = tracker.finalize(min_length=min_length)
+    json_data = tracker.finalize(min_length=min_length, min_travel=min_travel)
 
     return json_data
 

lib/fish_eye/tracker.py

@@ -68,7 +68,7 @@ class Tracker:
         else:
             self.frame_id += 1
     
-    def finalize(self, output_path=None, min_length=-1.0): # vert_margin=0.0
+    def finalize(self, output_path=None, min_length=-1.0, min_travel=-1.0): # vert_margin=0.0
         json_data = deepcopy(self.json_data)
            
         # map (valid) fish IDs to 0, 1, 2, ...
@@ -136,7 +136,7 @@ class Tracker:
         if min_length != -1.0:
             new_fish = []
             for fish in json_data['fish']:
-                if fish['length'] > min_length:
+                if fish['length'] > min_length and fish['travel_dist'] > min_travel:
                     new_fish.append(fish)
                 else:
                     invalid_ids.append(fish['id'])