sciveo 0.1.29__tar.gz → 0.1.31__tar.gz

{sciveo-0.1.29 → sciveo-0.1.31}/PKG-INFO

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

{sciveo-0.1.29 → sciveo-0.1.31}/sciveo/ml/evaluation/object_detection.py

@@ -31,7 +31,7 @@ class EvalObjectDetection:
   # Convert from yolo predictions
   def from_yolo(self):
     self.converted_predictions = []
-    for predicted in predictions:
+    for predicted in self.predictions:
       boxes = predicted.boxes
       class_names = predicted.names
 
@@ -80,7 +80,7 @@ class EvalObjectDetection:
     return inter_area / union_area
 
   # Compute the Average Precision (AP)
-  def compute_ap(self, class_name, iou_threshold=0.0):
+  def compute_ap(self, class_name, confidence_threshold=0.0):
     """
     Calculate the Average Precision based on IoU and confidence scores.
     Returns the AP for the current class.
@@ -89,7 +89,6 @@ class EvalObjectDetection:
     count_labels = 0
     true_positives = []
     false_positives = []
-    false_negatives = []
     detected = []
 
     for i, prediction in enumerate(self.converted_predictions):
@@ -97,9 +96,11 @@ class EvalObjectDetection:
       current_labels = self.converted_labels[i].get(class_name, [])
 
       count_labels += len(current_labels)
-      TP = 0
 
       for prediction_box in current_predictions:
+        if prediction_box[4] < confidence_threshold:
+          continue
+
         max_iou = 0
         gt_match = None
 
@@ -109,44 +110,37 @@ class EvalObjectDetection:
             max_iou = iou
             gt_match = label_box
 
-        if max_iou >= iou_threshold and gt_match not in detected:
+        if gt_match is not None and gt_match not in detected:
           true_positives.append(1)
           false_positives.append(0)
           detected.append(gt_match)
-          TP += 1
         else:
           true_positives.append(0)
           false_positives.append(1)
 
-      FN = len(current_labels) - TP
-      false_negatives.append(FN)
-
     # Convert to cumulative sums
     tp_cumsum = np.cumsum(true_positives)
     fp_cumsum = np.cumsum(false_positives)
 
     # Compute recall and precision
-    recall = tp_cumsum / count_labels
-    precision = tp_cumsum / (tp_cumsum + fp_cumsum)
+    recall = tp_cumsum / (count_labels + 1e-20)
+    precision = tp_cumsum / (tp_cumsum + fp_cumsum + 1e-20)
 
     # Compute AP using the trapezoidal rule (integrating precision over recall)
     ap = np.trapz(precision, recall)
-    return ap, np.sum(false_negatives) / count_labels
+    return ap
 
-  def threshold(self, class_name, max_false_negative):
+  def threshold(self, class_name):
     list_ap = []
-    list_fn = []
     list_thresholds = np.linspace(0.0, 1.0, 101).tolist()
-    for i, iou_threshold in enumerate(list_thresholds):
-      ap, FN = self.compute_ap(class_name, iou_threshold)
-      #debug("AP", ap, "FN", FN)
-      if FN > max_false_negative:
-        ap = 0.0
+    for i, threshold in enumerate(list_thresholds):
+      ap = self.compute_ap(class_name, threshold)
       list_ap.append(ap)
-      list_fn.append(FN)
+      if i % 10 == 0:
+        debug(class_name, "threshold", threshold, "ap", ap)
     idx = list_ap.index(max(list_ap))
-    debug("Threshold", class_name, list_thresholds[idx], "AP", list_ap[idx], "FN", list_fn[idx])
-    return list_thresholds[idx], list_ap[idx], list_fn[idx]
+    debug("Threshold", class_name, list_thresholds[idx], "AP", list_ap[idx])
+    return list_thresholds[idx], list_ap[idx]
 
   def evaluate(self, iou_thresholds={"default": 0.0}):
     """
@@ -155,7 +149,7 @@ class EvalObjectDetection:
     aps = []
     class_ap = {}
     for class_name in self.class_names:
-      ap, false_negatives = self.compute_ap(class_name, iou_thresholds.get(class_name, iou_thresholds["default"]))
+      ap = self.compute_ap(class_name, iou_thresholds.get(class_name, iou_thresholds["default"]))
       aps.append(ap)
       class_ap[class_name] = ap
 

sciveo-0.1.31/sciveo/version.py

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

{sciveo-0.1.29 → sciveo-0.1.31}/sciveo.egg-info/PKG-INFO

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

sciveo-0.1.29/sciveo/version.py

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