Max length hyperparameter

InferenceConfig.py

@@ -20,6 +20,7 @@ NMS_IOU  = 0.25 # NMS IOU
 MAX_AGE = 20 # time until missing fish get's new id
 MIN_HITS = 11 # minimum number of frames with a specific fish for it to count
 MIN_LENGTH = 0.3 # minimum fish length, in meters
+MAX_LENGTH = 1.5 # maximum fish length, in meters
 IOU_THRES = 0.01 # IOU threshold for tracking
 MIN_TRAVEL = 0 # Minimum distance a track has to travel
 DEFAULT_TRACKER = TrackerType.BYTETRACK
@@ -27,13 +28,14 @@ DEFAULT_TRACKER = TrackerType.BYTETRACK
 class InferenceConfig:
     def __init__(self, 
                 weights=WEIGHTS, conf_thresh=CONF_THRES, nms_iou=NMS_IOU, 
-                min_hits=MIN_HITS, max_age=MAX_AGE, min_length=MIN_LENGTH, min_travel=MIN_TRAVEL):
+                min_hits=MIN_HITS, max_age=MAX_AGE, min_length=MIN_LENGTH, max_length=MAX_LENGTH, min_travel=MIN_TRAVEL):
         self.weights = weights
         self.conf_thresh = conf_thresh
         self.nms_iou = nms_iou
         self.min_hits = min_hits
         self.max_age = max_age
         self.min_length = min_length
+        self.max_length = max_length
         self.min_travel = min_travel
 
         self.associative_tracker = DEFAULT_TRACKER

app.py

@@ -31,7 +31,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, associative_tracker, boost_power, boost_decay, byte_low_conf, byte_high_conf, min_length, min_travel, output_formats):
+def on_aris_input(file_list, model_id, conf_thresh, iou_thresh, min_hits, max_age, associative_tracker, boost_power, boost_decay, byte_low_conf, byte_high_conf, min_length, max_length, min_travel, output_formats):
 
     print(output_formats)
 
@@ -48,6 +48,7 @@ def on_aris_input(file_list, model_id, conf_thresh, iou_thresh, min_hits, max_ag
         min_hits = min_hits,
         max_age = max_age,
         min_length = min_length,
+        max_length = max_length,
         min_travel = min_travel,
     )
 

gradio_scripts/upload_ui.py

@@ -49,7 +49,8 @@ def Upload_Gradio(gradio_components):
                 gr.Markdown("Other")
                 with gr.Row():
                     settings.append(gr.Slider(0, 3, value=default_settings.min_length, label="Min Length", info="Minimum length of fish (meters) in order for it to count"))
-                    settings.append(gr.Slider(0, 5, value=default_settings.min_travel, label="Min Travel", info="Minimum travel distance of track (meters) in order for it to count"))
+                    settings.append(gr.Slider(0, 3, value=default_settings.max_length, label="Max Length", info="Maximum length of fish (meters) in order for it to count"))
+                    settings.append(gr.Slider(0, 10, value=default_settings.min_travel, label="Min Travel", info="Minimum travel distance of track (meters) in order for it to count"))
 
                 gradio_components['hyperparams'] = settings
 

inference.py

@@ -62,11 +62,11 @@ def do_full_inference(dataloader, image_meter_width, image_meter_height, gp=None
     if config.associative_tracker == TrackerType.BYTETRACK:
 
         # Find low confidence detections
-        low_outputs = do_suppression(inference, image_meter_width, width, conf_thres=config.byte_low_conf, iou_thres=config.nms_iou, gp=gp)
+        low_outputs = do_suppression(inference, image_meter_width, width, conf_thres=config.byte_low_conf, iou_thres=config.nms_iou, max_length=config.max_length, gp=gp)
         low_preds, real_width, real_height = format_predictions(image_shapes, low_outputs, width, height, gp=gp)
 
         # Find high confidence detections
-        high_outputs = do_suppression(inference, image_meter_width, width, conf_thres=config.byte_high_conf, iou_thres=config.nms_iou, gp=gp)
+        high_outputs = do_suppression(inference, image_meter_width, width, conf_thres=config.byte_high_conf, iou_thres=config.nms_iou, max_length=config.max_length, gp=gp)
         high_preds, real_width, real_height = format_predictions(image_shapes, high_outputs, width, height, gp=gp)
 
         # Perform associative tracking (ByteTrack)
@@ -78,7 +78,7 @@ def do_full_inference(dataloader, image_meter_width, image_meter_height, gp=None
     else: 
 
         # Find confident detections
-        outputs = do_suppression(inference, image_meter_width, width, conf_thres=config.conf_thresh, iou_thres=config.nms_iou, gp=gp)
+        outputs = do_suppression(inference, image_meter_width, width, conf_thres=config.conf_thresh, iou_thres=config.nms_iou, max_length=config.max_length, gp=gp)
 
         if config.associative_tracker == TrackerType.CONF_BOOST:
 
@@ -86,7 +86,7 @@ def do_full_inference(dataloader, image_meter_width, image_meter_height, gp=None
             do_confidence_boost(inference, outputs, boost_power=config.boost_power, boost_decay=config.boost_decay, gp=gp)
 
             # Find confident detections from boosted list
-            outputs = do_suppression(inference, image_meter_width, width, conf_thres=config.conf_thresh, iou_thres=config.nms_iou, gp=gp)
+            outputs = do_suppression(inference, image_meter_width, width, conf_thres=config.conf_thresh, iou_thres=config.nms_iou, max_length=config.max_length, gp=gp)
 
         # Format confident detections
         all_preds, real_width, real_height = format_predictions(image_shapes, outputs, width, height, gp=gp)