sciveo 0.1.83__tar.gz → 0.1.84__tar.gz

{sciveo-0.1.83 → sciveo-0.1.84}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sciveo
-Version: 0.1.83
+Version: 0.1.84
 Description-Content-Type: text/markdown
 Provides-Extra: mon
 Provides-Extra: net

{sciveo-0.1.83 → sciveo-0.1.84}/sciveo/media/capture/gst_server.py

@@ -146,12 +146,20 @@ class CamFactory(ColorBarFactory):
       self.cam = CameraDaemon(cam_id=self.cam_id)
 
   def next_frame(self):
-    frame = self.cam.read()
+    try:
+      frame = self.cam.read()
+    except Exception as e:
+      exception(e, "CAM frame read FAIL")
+      frame = None
+
     if frame is None:
       frame = super().next_frame()
 
-    for k, v in self.configuration.get("draw", {}).items():
-      self.list_draw_processors.get(k, DrawNone())(frame, v)
+    try:
+      for k, v in self.configuration.get("draw", {}).items():
+        self.list_draw_processors.get(k, DrawNone())(frame, v)
+    except Exception as e:
+      exception(e, "DRAW FAIL")
 
     self.fps_next_frame.update()
 

{sciveo-0.1.83 → sciveo-0.1.84}/sciveo/media/capture/rpi.py

@@ -46,10 +46,13 @@ class RPICamera(CameraDaemon):
     self.picam2.stop()
 
   def read_frame(self):
-    frame = self.picam2.capture_array()
-    cv2.cvtColor(frame, cv2.COLOR_RGB2BGR)
-    with self.lock_frame:
-      self.frame = frame
+    try:
+      frame = self.picam2.capture_array()
+      cv2.cvtColor(frame, cv2.COLOR_RGB2BGR)
+      with self.lock_frame:
+        self.frame = frame
+    except Exception as e:
+      exception(e, "CAM frame read FAIL")
 
 
 class RPICameraFactory(CamFactory):

{sciveo-0.1.83 → sciveo-0.1.84}/sciveo/ml/evaluation/object_detection.py

@@ -105,7 +105,6 @@ class EvalObjectDetection:
     count_labels = 0
     true_positives = []
     false_positives = []
-    detected = []
 
     for i, prediction in enumerate(self.converted_predictions):
       current_predictions = prediction.get(class_name, [])
@@ -113,6 +112,8 @@ class EvalObjectDetection:
 
       count_labels += len(current_labels)
 
+      detected = set()
+
       for prediction_box in current_predictions:
         if prediction_box[4] < confidence_threshold:
           continue
@@ -126,10 +127,12 @@ class EvalObjectDetection:
             max_iou = iou
             gt_match = label_box
 
-        if gt_match is not None and gt_match not in detected:
+        gt_match_key = tuple([round(x, 6) for x in gt_match]) if gt_match is not None else None
+
+        if gt_match is not None and gt_match_key not in detected:
           true_positives.append(1)
           false_positives.append(0)
-          detected.append(gt_match)
+          detected.add(gt_match_key)
         else:
           true_positives.append(0)
           false_positives.append(1)
@@ -143,7 +146,8 @@ class EvalObjectDetection:
     FP = np.sum(false_positives) / (count_labels + 1e-20)
 
     # Compute AP using the trapezoidal rule (integrating precision over recall)
-    ap = np.trapz(precision, recall)
+    order = np.argsort(recall)
+    ap = np.trapezoid(precision[order], recall[order])
     return ap, FP
 
   # TODO: Use simple gradient-based threshold optimisation instead of current grid search.
@@ -199,13 +203,15 @@ class EvalObjectDetection:
 
   def evaluate(self, confidence_thresholds={"default": 0.0}):
     """
-    Calculate metrics like mAP based on IoU.
+    Non-classical AP-related FP-constrained AP@IoU=0.5 calculation
     """
 
     aps = []
     class_ap = {}
     class_FP = {}
 
+    info("Evaluating non-classical FP-constrained AP@IoU=0.5")
+
     for class_name in self.class_names:
       ap, FP = self.compute_ap(class_name, confidence_thresholds.get(class_name, confidence_thresholds["default"]))
       aps.append(ap)

sciveo-0.1.84/sciveo/version.py

@@ -0,0 +1,2 @@
+
+__version__ = '0.1.84'

{sciveo-0.1.83 → sciveo-0.1.84}/sciveo.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sciveo
-Version: 0.1.83
+Version: 0.1.84
 Description-Content-Type: text/markdown
 Provides-Extra: mon
 Provides-Extra: net

sciveo-0.1.83/sciveo/version.py

@@ -1,2 +0,0 @@
-
-__version__ = '0.1.83'